diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 3cbb0d936e23bb5e90773f1cb2b0e32159de938c..ac4bc5b0663baf529caaacfa88423b8123212be3 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -259,8 +259,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
     return;
   }
 
-  pSql->pRpcCtx = NULL;    // clear the rpcCtx
-
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   if (pQueryInfo != NULL && pQueryInfo->type == TSDB_QUERY_TYPE_FREE_RESOURCE) {
     tscDebug("%p sqlObj needs to be released or DB connection is closed, cmd:%d type:%d, pObj:%p signature:%p",
@@ -389,6 +387,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
   }
 
   rpcFreeCont(rpcMsg->pCont);
+
 }
 
 int doProcessSql(SSqlObj *pSql) {
@@ -475,6 +474,7 @@ void tscKillSTableQuery(SSqlObj *pSql) {
     pSub->res.code = TSDB_CODE_TSC_QUERY_CANCELLED;
     if (pSub->pRpcCtx != NULL) {
       rpcCancelRequest(pSub->pRpcCtx);
+      pSub->pRpcCtx = NULL;
     }
 
     tscQueueAsyncRes(pSub); // async res? not other functions?
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 430a762321718eb78f6271e43086390ea1f2439b..acc93530e3e8f49534aa0c1a8bfb0a22987c9bdd 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -698,6 +698,7 @@ void taos_stop_query(TAOS_RES *res) {
     tscKillSTableQuery(pSql);
   } else {
     if (pSql->cmd.command < TSDB_SQL_LOCAL) {
+      assert(pSql->pRpcCtx != NULL);
       rpcCancelRequest(pSql->pRpcCtx);
     }
   }