diff --git a/source/client/src/clientStmt.c b/source/client/src/clientStmt.c
index 3a7ffa40d2..932b5e8980 100644
--- a/source/client/src/clientStmt.c
+++ b/source/client/src/clientStmt.c
@@ -48,12 +48,12 @@ bool stmtDequeue(STscStmt* pStmt, SStmtQNode** param) {
       (void)taosThreadMutexLock(&pStmt->queue.mutex);
       (void)taosThreadCondWait(&pStmt->queue.waitCond, &pStmt->queue.mutex);
       (void)taosThreadMutexUnlock(&pStmt->queue.mutex);
-      if (atomic_load_8((int8_t*)&pStmt->queue.stopQueue)) {
-        (void)taosThreadMutexUnlock(&pStmt->queue.mutex);
-        return false;
-      }
     }
   }
+  if (pStmt->queue.stopQueue) {
+    (void)taosThreadMutexUnlock(&pStmt->queue.mutex);
+    return false;
+  }
   SStmtQNode* orig = pStmt->queue.head;
   SStmtQNode* node = pStmt->queue.head->next;
   pStmt->queue.head = pStmt->queue.head->next;
@@ -61,20 +61,16 @@ bool stmtDequeue(STscStmt* pStmt, SStmtQNode** param) {
 
   (void)atomic_sub_fetch_64((int64_t*)&pStmt->queue.qRemainNum, 1);
 
-
-  *param = node;
-
   return true;
 }
 
 void stmtEnqueue(STscStmt* pStmt, SStmtQNode* param) {
-
   pStmt->queue.tail->next = param;
   pStmt->queue.tail = param;
 
   pStmt->stat.bindDataNum++;
   (void)atomic_add_fetch_64(&pStmt->queue.qRemainNum, 1);
-  
+
   (void)taosThreadMutexLock(&pStmt->queue.mutex);
   (void)taosThreadCondSignal(&(pStmt->queue.waitCond));
   (void)taosThreadMutexUnlock(&pStmt->queue.mutex);
@@ -782,7 +778,7 @@ void* stmtBindThreadFunc(void* param) {
   STscStmt* pStmt = (STscStmt*)param;
 
   while (true) {
-    if (atomic_load_8((int8_t*)&pStmt->queue.stopQueue)) {
+    if (pStmt->queue.stopQueue) {
       break;
     }
 
@@ -1634,6 +1630,7 @@ int stmtClose(TAOS_STMT* stmt) {
   STMT_DLOG_E("start to free stmt");
 
   pStmt->queue.stopQueue = true;
+  (void)atomic_add_fetch_64(&pStmt->queue.qRemainNum, 1);
 
   (void)taosThreadMutexLock(&pStmt->queue.mutex);
   (void)taosThreadCondSignal(&(pStmt->queue.waitCond));