diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 1a8325cc43ed333a5014d38ccf2d05f0e2116e1a..627d06ac2e59ec2bdb222998ea05018c038830ab 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -260,6 +260,14 @@ int32_t shellRunCommand(TAOS* con, char* command) {
 }
 
 
+void freeResultWithRid(int64_t rid) {
+  SSqlObj* pSql = taosAcquireRef(tscObjRef, rid);
+  if(pSql){
+    taos_free_result(pSql);
+    taosReleaseRef(tscObjRef, rid);
+  }
+}
+
 void shellRunCommandOnServer(TAOS *con, char command[]) {
   int64_t   st, et;
   wordexp_t full_path;
@@ -301,14 +309,15 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
     return;
   }
 
-  result = ((SSqlObj*)tmpSql)->self;
+  atomic_store_64(&result, ((SSqlObj*)tmpSql)->self);
+  int64_t oresult = atomic_load_64(&result);
 
   if (regex_match(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
     fprintf(stdout, "Database changed.\n\n");
     fflush(stdout);
 
     atomic_store_64(&result, 0);
-    taos_free_result(pSql);
+    freeResultWithRid(oresult);
     return;
   }
 
@@ -317,7 +326,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
     int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
     if (numOfRows < 0) {
       atomic_store_64(&result, 0);
-      taos_free_result(pSql);
+      freeResultWithRid(oresult);
       return;
     }
 
@@ -340,7 +349,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   }
 
   atomic_store_64(&result, 0);
-  taos_free_result(pSql);
+  freeResultWithRid(oresult);
 }
 
 /* Function to do regular expression check */
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index 7b812f5d5bc413e146accd58e1bcc24934b4c2f5..041ad71ccba47cf2b84984af89d25ff15ccf16ce 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -19,17 +19,31 @@
 #include "tnettest.h"
 
 pthread_t pid;
+static tsem_t cancelSem;
 
 void shellQueryInterruptHandler(int signum) {
+  tsem_post(&cancelSem);
+}
+
+void *cancelHandler(void *arg) {
+  while(1) {
+    if (tsem_wait(&cancelSem) != 0) {
+      taosMsleep(10);
+      continue;
+    }
+
 #ifdef LINUX
-  int64_t rid = atomic_val_compare_exchange_64(&result, result, 0);
-  SSqlObj* pSql = taosAcquireRef(tscObjRef, rid);
-  taos_stop_query(pSql);
-  taosReleaseRef(tscObjRef, rid);
+    int64_t rid = atomic_val_compare_exchange_64(&result, result, 0);
+    SSqlObj* pSql = taosAcquireRef(tscObjRef, rid);
+    taos_stop_query(pSql);
+    taosReleaseRef(tscObjRef, rid);
 #else
-  printf("\nReceive ctrl+c or other signal, quit shell.\n");
-  exit(0);
+    printf("\nReceive ctrl+c or other signal, quit shell.\n");
+    exit(0);
 #endif
+  }
+  
+  return NULL;
 }
 
 int checkVersion() {
@@ -107,6 +121,14 @@ int main(int argc, char* argv[]) {
     exit(EXIT_FAILURE);
   }
 
+  if (tsem_init(&cancelSem, 0, 0) != 0) {
+    printf("failed to create cancel semphore\n");
+    exit(EXIT_FAILURE);
+  }
+
+  pthread_t spid;
+  pthread_create(&spid, NULL, cancelHandler, NULL);
+
   /* Interrupt handler. */
   struct sigaction act;
   memset(&act, 0, sizeof(struct sigaction));