diff --git a/src/query/src/queryExecutor.c b/src/query/src/queryExecutor.c
index b13d129c8c927fc5b976beb16c82a3c88d9ca494..e626de6243e099ea110f3002e926526cabe48f27 100644
--- a/src/query/src/queryExecutor.c
+++ b/src/query/src/queryExecutor.c
@@ -6099,9 +6099,7 @@ int32_t qCreateQueryInfo(void *tsdb, SQueryTableMsg *pQueryMsg, qinfo_t *pQInfo)
 
   if ((pQueryMsg->queryType & TSDB_QUERY_TYPE_STABLE_QUERY) != 0) {
     isSTableQuery = true;
-
     STableId *id = taosArrayGet(pTableIdList, 0);
-    id->uid = -1;  // todo fix me
     
     // group by normal column, do not pass the group by condition to tsdb to group table into different group
     int32_t numOfGroupByCols = pQueryMsg->numOfGroupCols;
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 81cba7b6fac6fa366ef67797ed12415a17c34298..02743c3e5d5b509058a9c40a761ada9903dc3955 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -135,7 +135,8 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
     }
     tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false);
     tsdbTableSetSName(&tCfg, pTable->superTableId, false);
-
+    tsdbTableSetSuperUid(&tCfg, htobe64(pTable->superTableUid));
+    
     char *pTagData = pTable->data + totalCols * sizeof(SSchema);
     int accumBytes = 0;
     SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema);