diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 564d5ae23f..0732863793 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -246,43 +246,52 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
     rpcMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
   } else {
     STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-    if (rpcMsg->code == TSDB_CODE_TDB_INVALID_TABLE_ID || rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID || 
-        rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL || rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+    if (rpcMsg->code != TSDB_CODE_SUCCESS) {
       if (pCmd->command == TSDB_SQL_CONNECT) {
         rpcMsg->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
         rpcFreeCont(rpcMsg->pCont);
         return;
-      } else if (pCmd->command == TSDB_SQL_HB) {
+      }
+
+      if (pCmd->command == TSDB_SQL_HB) {
         rpcMsg->code = TSDB_CODE_RPC_NOT_READY;
         rpcFreeCont(rpcMsg->pCont);
         return;
-      } else if (pCmd->command == TSDB_SQL_META) {
-        // get table meta query will not retry, do nothing
+      }
+
+      if (pCmd->command == TSDB_SQL_META || pCmd->command == TSDB_SQL_DESCRIBE_TABLE ||
+          pCmd->command == TSDB_SQL_STABLEVGROUP || pCmd->command == TSDB_SQL_SHOW ||
+          pCmd->command == TSDB_SQL_RETRIEVE) {
+        // get table meta/vgroup query will not retry, do nothing
+      }
+    }
+
+    if ((pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_FETCH || pCmd->command == TSDB_SQL_INSERT ||
+         pCmd->command == TSDB_SQL_UPDATE_TAGS_VAL) &&
+        (rpcMsg->code == TSDB_CODE_TDB_INVALID_TABLE_ID || rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID ||
+         rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL || rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE)) {
+      tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
+      // set the flag to denote that sql string needs to be re-parsed and build submit block with table schema
+      if (rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+        pSql->cmd.submitSchema = 1;
+      }
+
+      pSql->res.code = rpcMsg->code;  // keep the previous error code
+      if (pSql->retry > pSql->maxRetry) {
+        tscError("%p max retry %d reached, give up", pSql, pSql->maxRetry);
       } else {
-        tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
+        rpcMsg->code = tscRenewTableMeta(pSql, pTableMetaInfo->name);
 
-        // set the flag to denote that sql string needs to be re-parsed and build submit block with table schema
-        if (rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
-          pSql->cmd.submitSchema = 1;
-        }
-
-        pSql->res.code = rpcMsg->code;  // keep the previous error code
-        if (pSql->retry > pSql->maxRetry) {
-          tscError("%p max retry %d reached, give up", pSql, pSql->maxRetry);
-        } else {
-          rpcMsg->code = tscRenewTableMeta(pSql, pTableMetaInfo->name);
-
-          // if there is an error occurring, proceed to the following error handling procedure.
-          // todo add test cases
-          if (rpcMsg->code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-            rpcFreeCont(rpcMsg->pCont);
-            return;
-          }
+        // if there is an error occurring, proceed to the following error handling procedure.
+        // todo add test cases
+        if (rpcMsg->code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+          rpcFreeCont(rpcMsg->pCont);
+          return;
         }
       }
     }
   }
-  
+
   pRes->rspLen = 0;
   
   if (pRes->code != TSDB_CODE_TSC_QUERY_CANCELLED) {