diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 22ddea557efb7de1a29b96a89e90161fa3c57b4e..7bd08499e76fdf428221c70461c3ab55038f8b08 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -333,9 +333,15 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       .code    = 0
   };
 
-  if ((rpcMsg.msgType == TSDB_MSG_TYPE_SUBMIT) && (tsShortcutFlag & TSDB_SHORTCUT_RPC_SEND_SUBMIT)) {
-    rpcFreeCont(rpcMsg.pCont);
-    return TSDB_CODE_FAILED;
+  switch (rpcMsg.msgType) {
+    case TSDB_MSG_TYPE_SUBMIT:
+      if (tsShortcutFlag & TSDB_SHORTCUT_RPC_SEND_SUBMIT) {
+        rpcFreeCont(rpcMsg.pCont);
+        return TSDB_CODE_FAILED;
+      }
+      break;
+    default:
+      break;
   }
 
   rpcSendRequest(pObj->pRpcObj->pDnodeConn, &pSql->epSet, &rpcMsg, &pSql->rpcRid);