diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 6544898be9ff389cf441d8824ef06b235fd7cc35..d1011cbf3a93847d239e96ecd9504a7be086dd91 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -1070,7 +1070,7 @@ static int32_t createProjectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSel
 
   TSWAP(pProject->node.pLimit, pSelect->pLimit);
   TSWAP(pProject->node.pSlimit, pSelect->pSlimit);
-  pProject->ignoreGroupId = pSelect->isSubquery ? true : (NULL == pSelect->pPartitionByList);
+  pProject->ignoreGroupId = (pSelect->isSubquery && NULL == pProject->node.pLimit && NULL == pProject->node.pSlimit) ? true : (NULL == pSelect->pPartitionByList);
   pProject->node.groupAction =
       (!pSelect->isSubquery && pCxt->pPlanCxt->streamQuery) ? GROUP_ACTION_KEEP : GROUP_ACTION_CLEAR;
   pProject->node.requireDataOrder = DATA_ORDER_LEVEL_NONE;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 4f8b57de5fd1d75d0faae8df5a5a2a2e08108b4b..5cb3591984d1d49177699ba2173f624678b36a22 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2351,6 +2351,17 @@ static EDealRes mergeProjectionsExpr(SNode** pNode, void* pContext) {
   return DEAL_RES_CONTINUE;
 }
 
+static int32_t mergeProjectionsLogicNode(SLogicNode* pDstNode, SLogicNode* pSrcNode) {
+  SProjectLogicNode *pDstPro = (SProjectLogicNode*)pDstNode;
+  SProjectLogicNode *pSrcPro = (SProjectLogicNode*)pSrcNode;
+
+  if (!pSrcPro->ignoreGroupId) {
+    pDstPro->ignoreGroupId = pSrcPro->ignoreGroupId;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t mergeProjectsOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pLogicSubplan, SLogicNode* pSelfNode) {
   SLogicNode* pChild = (SLogicNode*)nodesListGetNode(pSelfNode->pChildren, 0);
 
@@ -2360,8 +2371,11 @@ static int32_t mergeProjectsOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan*
 
   if (TSDB_CODE_SUCCESS == code) {
     if (1 == LIST_LENGTH(pChild->pChildren)) {
-      SLogicNode* pGrandChild = (SLogicNode*)nodesListGetNode(pChild->pChildren, 0);
-      code = replaceLogicNode(pLogicSubplan, pChild, pGrandChild);
+      code = mergeProjectionsLogicNode(pSelfNode, pChild);
+      if (TSDB_CODE_SUCCESS == code) {
+        SLogicNode* pGrandChild = (SLogicNode*)nodesListGetNode(pChild->pChildren, 0);
+        code = replaceLogicNode(pLogicSubplan, pChild, pGrandChild);
+      }
     } else {  // no grand child
       NODES_CLEAR_LIST(pSelfNode->pChildren);
     }