diff --git a/source/libs/planner/inc/planInt.h b/source/libs/planner/inc/planInt.h
index 24b31f9f37..79cf87d941 100644
--- a/source/libs/planner/inc/planInt.h
+++ b/source/libs/planner/inc/planInt.h
@@ -60,6 +60,7 @@ bool        keysHasCol(SNodeList* pKeys);
 bool        keysHasTbname(SNodeList* pKeys);
 SFunctionNode* createGroupKeyAggFunc(SColumnNode* pGroupCol);
 int32_t getTimeRangeFromNode(SNode** pPrimaryKeyCond, STimeWindow* pTimeRange, bool* pIsStrict);
+int32_t tagScanSetExecutionMode(SScanLogicNode* pScan);
 
 #define CLONE_LIMIT 1
 #define CLONE_SLIMIT 1 << 1
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 60bce622be..23b8baf031 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -392,60 +392,6 @@ static int32_t makeScanLogicNode(SLogicPlanContext* pCxt, SRealTableNode* pRealT
 
 static bool needScanDefaultCol(EScanType scanType) { return SCAN_TYPE_TABLE_COUNT != scanType; }
 
-static EDealRes tagScanNodeHasTbnameFunc(SNode* pNode, void* pContext) {
-  if (QUERY_NODE_FUNCTION == nodeType(pNode) && FUNCTION_TYPE_TBNAME == ((SFunctionNode*)pNode)->funcType ||
-        (QUERY_NODE_COLUMN == nodeType(pNode) && COLUMN_TYPE_TBNAME == ((SColumnNode*)pNode)->colType)) {
-    *(bool*)pContext = true;
-    return DEAL_RES_END;
-  }
-  return DEAL_RES_CONTINUE;
-}
-
-static bool tagScanNodeListHasTbname(SNodeList* pCols) {
-  bool hasTbname = false;
-  nodesWalkExprs(pCols, tagScanNodeHasTbnameFunc, &hasTbname);
-  return hasTbname;
-}
-
-static bool tagScanNodeHasTbname(SNode* pKeys) {
-  bool hasTbname = false;
-  nodesWalkExpr(pKeys, tagScanNodeHasTbnameFunc, &hasTbname);
-  return hasTbname;
-}
-
-static int32_t tagScanSetExecutionMode(SScanLogicNode* pScan) {
-  pScan->onlyMetaCtbIdx = false;
-
-  if (pScan->tableType == TSDB_CHILD_TABLE) {
-    pScan->onlyMetaCtbIdx = false;
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (tagScanNodeListHasTbname(pScan->pScanPseudoCols)) {
-    pScan->onlyMetaCtbIdx = false;
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (pScan->node.pConditions == NULL) {
-    pScan->onlyMetaCtbIdx = true;
-    return TSDB_CODE_SUCCESS;
-  }
-
-  SNode* pCond = nodesCloneNode(pScan->node.pConditions);
-  SNode* pTagCond = NULL;
-  SNode* pTagIndexCond = NULL;
-  filterPartitionCond(&pCond, NULL, &pTagIndexCond, &pTagCond, NULL);
-  if (pTagIndexCond || tagScanNodeHasTbname(pTagCond)) {
-    pScan->onlyMetaCtbIdx = false;
-  } else {
-    pScan->onlyMetaCtbIdx = true;
-  }
-  nodesDestroyNode(pCond);
-  nodesDestroyNode(pTagIndexCond);
-  nodesDestroyNode(pTagCond);
-  return TSDB_CODE_SUCCESS;
-}
-
 static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SRealTableNode* pRealTable,
                                    SLogicNode** pLogicNode) {
   SScanLogicNode* pScan = NULL;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index eee0766589..191f7167e1 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -5142,7 +5142,6 @@ int32_t stbJoinOptRewriteToTagScan(SLogicNode* pJoin, SNode* pNode) {
   NODES_DESTORY_NODE(pScan->node.pConditions);
   pScan->node.requireDataOrder = DATA_ORDER_LEVEL_NONE;
   pScan->node.resultDataOrder = DATA_ORDER_LEVEL_NONE;
-  pScan->onlyMetaCtbIdx = true;
 
   SNodeList* pTags = nodesMakeList();
   int32_t    code = nodesCollectColumnsFromNode(pJoinNode->pTagEqCond, NULL, COLLECT_COL_TYPE_TAG, &pTags);
@@ -5177,6 +5176,8 @@ int32_t stbJoinOptRewriteToTagScan(SLogicNode* pJoin, SNode* pNode) {
     code = stbJoinOptAddFuncToScanNode("_vgid", pScan);
   }
 
+  tagScanSetExecutionMode(pScan);
+
   if (code) {
     nodesDestroyList(pTags);
   }
diff --git a/source/libs/planner/src/planUtil.c b/source/libs/planner/src/planUtil.c
index 3b9b348ff5..02572a1a90 100644
--- a/source/libs/planner/src/planUtil.c
+++ b/source/libs/planner/src/planUtil.c
@@ -615,3 +615,61 @@ int32_t getTimeRangeFromNode(SNode** pPrimaryKeyCond, STimeWindow* pTimeRange, b
 }
 
 
+static EDealRes tagScanNodeHasTbnameFunc(SNode* pNode, void* pContext) {
+  if (QUERY_NODE_FUNCTION == nodeType(pNode) && FUNCTION_TYPE_TBNAME == ((SFunctionNode*)pNode)->funcType ||
+        (QUERY_NODE_COLUMN == nodeType(pNode) && COLUMN_TYPE_TBNAME == ((SColumnNode*)pNode)->colType)) {
+    *(bool*)pContext = true;
+    return DEAL_RES_END;
+  }
+  return DEAL_RES_CONTINUE;
+}
+
+static bool tagScanNodeListHasTbname(SNodeList* pCols) {
+  bool hasTbname = false;
+  nodesWalkExprs(pCols, tagScanNodeHasTbnameFunc, &hasTbname);
+  return hasTbname;
+}
+
+static bool tagScanNodeHasTbname(SNode* pKeys) {
+  bool hasTbname = false;
+  nodesWalkExpr(pKeys, tagScanNodeHasTbnameFunc, &hasTbname);
+  return hasTbname;
+}
+
+
+
+int32_t tagScanSetExecutionMode(SScanLogicNode* pScan) {
+  pScan->onlyMetaCtbIdx = false;
+
+  if (pScan->tableType == TSDB_CHILD_TABLE) {
+    pScan->onlyMetaCtbIdx = false;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (tagScanNodeListHasTbname(pScan->pScanPseudoCols)) {
+    pScan->onlyMetaCtbIdx = false;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (pScan->node.pConditions == NULL) {
+    pScan->onlyMetaCtbIdx = true;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  SNode* pCond = nodesCloneNode(pScan->node.pConditions);
+  SNode* pTagCond = NULL;
+  SNode* pTagIndexCond = NULL;
+  filterPartitionCond(&pCond, NULL, &pTagIndexCond, &pTagCond, NULL);
+  if (pTagIndexCond || tagScanNodeHasTbname(pTagCond)) {
+    pScan->onlyMetaCtbIdx = false;
+  } else {
+    pScan->onlyMetaCtbIdx = true;
+  }
+  nodesDestroyNode(pCond);
+  nodesDestroyNode(pTagIndexCond);
+  nodesDestroyNode(pTagCond);
+  return TSDB_CODE_SUCCESS;
+}
+
+
+
diff --git a/tests/script/tsim/join/inner_join.sim b/tests/script/tsim/join/inner_join.sim
index 65a6a3e3ff..7b9209813d 100644
--- a/tests/script/tsim/join/inner_join.sim
+++ b/tests/script/tsim/join/inner_join.sim
@@ -194,4 +194,12 @@ if $rows != 144 then
   return -1
 endi
 
+sql select a.ts, b.ts from tba1 a join sta b on a.ts = b.ts and a.t1 = b.t1;
+if $rows != 4 then
+  return -1
+endi
 
+sql select a.ts, b.ts from sta a join sta b on a.ts = b.ts and a.t1 = b.t1;
+if $rows != 8 then
+  return -1
+endi