diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index fddf1b64a1857bee07f0e27a3dcae8c6443480f5..1b1388238ca7775d1f8ee0127448c6e9d0dd22c2 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -787,9 +787,10 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     pSqlFuncExpr = (SSqlFuncMsg *)pMsg;
   }
 
-  if (tscIsSecondStageQuery(pQueryInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) ||
-      UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) {
-    size_t output = tscNumOfFields(pQueryInfo);
+  size_t output = tscNumOfFields(pQueryInfo);
+
+  if ((tscIsSecondStageQuery(pQueryInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) ||
+      UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) && (output != tscSqlExprNumOfExprs(pQueryInfo))) {
     pQueryMsg->secondStageOutput = htonl((int32_t) output);
 
     SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;