diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
index 2c3644b3a..6783dcd69 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
@@ -77,6 +77,7 @@ public class SqlExecutor implements ChatQueryExecutor {
 
         long startTime = System.currentTimeMillis();
         QueryResult queryResult = new QueryResult();
+        queryResult.setQueryId(executeContext.getRequest().getQueryId());
         queryResult.setChatContext(parseInfo);
         queryResult.setQueryMode(parseInfo.getQueryMode());
         queryResult.setQueryTimeCost(System.currentTimeMillis() - startTime);
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/ErrorMsgRewriteProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/ErrorMsgRewriteProcessor.java
index 8fcd108c4..e74f29feb 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/ErrorMsgRewriteProcessor.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/ErrorMsgRewriteProcessor.java
@@ -47,7 +47,7 @@ public class ErrorMsgRewriteProcessor implements ParseResultProcessor {
     public boolean accept(ParseContext parseContext) {
         ChatApp chatApp = parseContext.getAgent().getChatAppConfig().get(APP_KEY_ERROR_MESSAGE);
         return StringUtils.isNotBlank(parseContext.getResponse().getErrorMsg())
-                && Objects.nonNull(chatApp) || chatApp.isEnable();
+                && Objects.nonNull(chatApp) && chatApp.isEnable();
     }
 
     @Override