diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 1ccf9c5ec45e087319ae246a386b09c7145a9a0f..7594a73c9604b25fb29143e7b88ad7876b2a496d 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -590,18 +590,6 @@ static UNUSED_FUNC bool tscKillQueryInDnode(SSqlObj* pSql) {
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
-  if (pQueryInfo != 0) {
-    STableMetaInfo *pTableMetaInfo1 = tscGetMetaInfo(pQueryInfo, 0);
-    if (pTableMetaInfo1 != NULL) {
-      // for select query super table, the super table vgroup list can not be null in any cases.
-      if (pQueryInfo->command == TSDB_SQL_SELECT && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo1)) {
-        if (pTableMetaInfo1->pVgroupTables == 0) {
-          tscError("error !!!%p, vgroupTable is null", pSql);
-        }
-      }
-    }
-  }
-
   if ((pQueryInfo == NULL) || tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
     return true;
   }
@@ -716,18 +704,6 @@ static void tscKillSTableQuery(SSqlObj *pSql) {
 
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
-  if (pQueryInfo != 0) {
-    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-    if (pTableMetaInfo != NULL) {
-      // for select query super table, the super table vgroup list can not be null in any cases.
-      if (pQueryInfo->command == TSDB_SQL_SELECT && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-        if (pTableMetaInfo->pVgroupTables == 0) {
-          tscError("error !!!%p, vgroupTable is null", pSql);
-        }
-      }
-    }
-  }
-
   if (!tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
     return;
   }
@@ -777,18 +753,6 @@ void taos_stop_query(TAOS_RES *res) {
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
-    if (pQueryInfo != 0) {
-    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-    if (pTableMetaInfo != NULL) {
-      // for select query super table, the super table vgroup list can not be null in any cases.
-      if (pQueryInfo->command == TSDB_SQL_SELECT && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-        if (pTableMetaInfo->pVgroupTables == 0) {
-          tscError("error !!!%p, vgroupTable is null", pSql);
-        }
-      }
-    }
-  }
-
   if (tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
     assert(pSql->pRpcCtx == NULL);
     tscKillSTableQuery(pSql);
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index baa733ef4926695b3350dfb419f029eaba69e11e..a38be04ae0d74a6967b5a9dac5c4e30473759d79 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -2098,18 +2098,6 @@ void tscDoQuery(SSqlObj* pSql) {
   } else {
     SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
     uint16_t type = pQueryInfo->type;
-
-    if (pQueryInfo != 0) {
-      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-      if (pTableMetaInfo != NULL) {
-        // for select query super table, the super table vgroup list can not be null in any cases.
-        if (pQueryInfo->command == TSDB_SQL_SELECT && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-          if (pTableMetaInfo->pVgroupTables == 0) {
-            tscError("error !!!%p, vgroupTable is null", pSql);
-          }
-        }
-      }
-    }
   
     if (pSql->fp == (void(*)())tscHandleMultivnodeInsert) {  // multi-vnodes insertion
       tscHandleMultivnodeInsert(pSql);