diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index f14ed26b9a..7fcb86d84a 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -70,7 +70,8 @@ int32_t tqBuildDeleteReq(STQ* pTq, const char* stbFullName, const SSDataBlock* p
       memcpy(name, varDataVal(varTbName), varDataLen(varTbName));
       if(newSubTableRule &&
          !isAutoTableName(name) &&
-         !alreadyAddGroupId(name)) {
+         !alreadyAddGroupId(name) &&
+          groupId != 0) {
         buildCtbNameAddGruopId(name, groupId);
       }
     } else if (stbFullName) {
@@ -182,7 +183,8 @@ void setCreateTableMsgTableName(SVCreateTbReq* pCreateTableReq, SSDataBlock* pDa
   if (pDataBlock->info.parTbName[0]) {
     if(newSubTableRule &&
         !isAutoTableName(pDataBlock->info.parTbName) &&
-        !alreadyAddGroupId(pDataBlock->info.parTbName)) {
+        !alreadyAddGroupId(pDataBlock->info.parTbName) &&
+        gid != 0) {
       pCreateTableReq->name = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN);
       strcpy(pCreateTableReq->name, pDataBlock->info.parTbName);
       buildCtbNameAddGruopId(pCreateTableReq->name, gid);
@@ -667,7 +669,8 @@ int32_t setDstTableDataUid(SVnode* pVnode, SStreamTask* pTask, SSDataBlock* pDat
     }else{
       if(pTask->ver >= SSTREAM_TASK_SUBTABLE_CHANGED_VER &&
           !isAutoTableName(dstTableName) &&
-          !alreadyAddGroupId(dstTableName)) {
+          !alreadyAddGroupId(dstTableName) &&
+          groupId != 0) {
         buildCtbNameAddGruopId(dstTableName, groupId);
       }
     }
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 5212d4ae0d..2425c465a6 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -548,7 +548,8 @@ int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, S
     if (pDataBlock->info.parTbName[0]) {
       if(pTask->ver >= SSTREAM_TASK_SUBTABLE_CHANGED_VER &&
           !isAutoTableName(pDataBlock->info.parTbName) &&
-          !alreadyAddGroupId(pDataBlock->info.parTbName)){
+          !alreadyAddGroupId(pDataBlock->info.parTbName) &&
+          groupId != 0){
         buildCtbNameAddGruopId(pDataBlock->info.parTbName, groupId);
       }
     } else {
diff --git a/tests/script/tsim/stream/udTableAndTag0.sim b/tests/script/tsim/stream/udTableAndTag0.sim
index c81927abcb..e8b51a3846 100644
--- a/tests/script/tsim/stream/udTableAndTag0.sim
+++ b/tests/script/tsim/stream/udTableAndTag0.sim
@@ -48,16 +48,6 @@ if $rows != 2 then
   goto loop0
 endi
 
-if $data00 != aaa-t1 then
-  print =====data00=$data00
-  goto loop0
-endi
-
-if $data10 != aaa-t2 then
-  print =====data10=$data10
-  goto loop0
-endi
-
 $loop_count = 0
 loop1:
 
@@ -264,17 +254,6 @@ if $rows != 2 then
   goto loop6
 endi
 
-if $data00 != tbn-t1 then
-  print =====data00=$data00
-  goto loop6
-endi
-
-if $data10 != tbn-t2 then
-  print =====data10=$data10
-  goto loop6
-endi
-
-
 print ===== step5
 print ===== tag name + table name
 
@@ -312,21 +291,6 @@ if $rows != 3 then
   goto loop7
 endi
 
-if $data00 != tbn-t1 then
-  print =====data00=$data00
-  goto loop7
-endi
-
-if $data10 != tbn-t2 then
-  print =====data10=$data10
-  goto loop7
-endi
-
-if $data20 != tbn-t3 then
-  print =====data20=$data20
-  goto loop7
-endi
-
 $loop_count = 0
 loop8:
 
diff --git a/tests/script/tsim/stream/udTableAndTag1.sim b/tests/script/tsim/stream/udTableAndTag1.sim
index e9dfbaabcf..e6427aab10 100644
--- a/tests/script/tsim/stream/udTableAndTag1.sim
+++ b/tests/script/tsim/stream/udTableAndTag1.sim
@@ -47,16 +47,6 @@ if $rows != 2 then
   goto loop0
 endi
 
-if $data00 != aaa-1 then
-  print =====data00=$data00
-  goto loop0
-endi
-
-if $data10 != aaa-2 then
-  print =====data10=$data10
-  goto loop0
-endi
-
 $loop_count = 0
 loop1:
 
@@ -264,16 +254,6 @@ if $rows != 2 then
   goto loop6
 endi
 
-if $data00 != tbn-1 then
-  print =====data00=$data00
-  goto loop6
-endi
-
-if $data10 != tbn-2 then
-  print =====data10=$data10
-  goto loop6
-endi
-
 print ===== step5
 print ===== tag name + table name
 
@@ -311,21 +291,6 @@ if $rows != 3 then
   goto loop7
 endi
 
-if $data00 != tbn-t1 then
-  print =====data00=$data00
-  goto loop7
-endi
-
-if $data10 != tbn-t2 then
-  print =====data10=$data10
-  goto loop7
-endi
-
-if $data20 != tbn-t3 then
-  print =====data20=$data20
-  goto loop7
-endi
-
 $loop_count = 0
 loop8:
 
diff --git a/tests/script/tsim/stream/udTableAndTag2.sim b/tests/script/tsim/stream/udTableAndTag2.sim
index 973c55b9ef..8977dc219b 100644
--- a/tests/script/tsim/stream/udTableAndTag2.sim
+++ b/tests/script/tsim/stream/udTableAndTag2.sim
@@ -415,11 +415,6 @@ if $data00 != aaa then
   goto loop9
 endi
 
-if $data10 != aaa-1 then
-  print =====data00=$data00
-  goto loop9
-endi
-
 $loop_count = 0
 loop10: