diff --git a/tests/script/tsim/query/separator.sim b/tests/script/tsim/query/separator.sim
index c2f6372e15..a49ac6312a 100644
--- a/tests/script/tsim/query/separator.sim
+++ b/tests/script/tsim/query/separator.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql select 'a;b' as x\G
+sql select 'a;b' as x
 if $rows != 1 then
   return -1
 endi
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 5ccbc8d2ab..8926d21534 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -202,6 +202,11 @@ void shellRunSingleCommandImp(char *command) {
     fname = sptr + 2;
     while (*fname == ' ') fname++;
     *sptr = '\0';
+
+    cptr = strstr(fname, ";");
+    if (cptr != NULL) {
+      *cptr = '\0';
+    }
   }
 
   if ((sptr = strstr(command, "\\G")) != NULL) {
diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index e83ceff099..fceec37a64 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -236,22 +236,17 @@ void shellRunSingleCommandWebsocketImp(char *command) {
   bool    printMode = false;
 
   if ((sptr = strstr(command, ">>")) != NULL) {
-    cptr = strstr(command, ";");
-    if (cptr != NULL) {
-      *cptr = '\0';
-    }
-
     fname = sptr + 2;
     while (*fname == ' ') fname++;
     *sptr = '\0';
-  }
 
-  if ((sptr = strstr(command, "\\G")) != NULL) {
-    cptr = strstr(command, ";");
+    cptr = strstr(fname, ";");
     if (cptr != NULL) {
       *cptr = '\0';
     }
+  }
 
+  if ((sptr = strstr(command, "\\G")) != NULL) {
     *sptr = '\0';
     printMode = true;  // When output to a file, the switch does not work.
   }