diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 87247d874bf358e0764a942693b02924fe69c53f..afac69350c80df639d255a0e8da01b6806458d05 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -168,6 +168,13 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
 
 TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
   tscTrace("try to create a connection to %s", ip);
+  if (port != 0) {
+    tsServerPort = port;
+    tsMnodeShellPort = tsServerPort + TSDB_PORT_MNODESHELL;
+    tsDnodeShellPort = tsServerPort + TSDB_PORT_DNODESHELL;
+    tsMnodeDnodePort = tsServerPort + TSDB_PORT_MNODEDNODE;
+    tsDnodeMnodePort = tsServerPort + TSDB_PORT_DNODEMNODE;
+  }
 
   STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL);
   if (pObj != NULL) {
diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h
index 7abe8a57767da2dfe0babb483505147885f6df69..381c6f1dbfcc9f4351919b7602a26be206248f0b 100644
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
@@ -61,6 +61,7 @@ struct arguments {
   int   threadNum;
   char* commands;
   int   abort;
+  int   port;
 };
 
 /**************** Function declarations ****************/
diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index 13513426cdea898a550ae6ed141246e290e9e555..cd2fe6df33eb20af82c196bbe36e9dc90425a29f 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -81,7 +81,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       // for management port
     else if (strcmp(argv[i], "-P") == 0) {
       if (i < argc - 1) {
-        tsMnodeShellPort = atoi(argv[++i]);
+        arguments->port = atoi(argv[++i]);
       } else {
         fprintf(stderr, "option -P requires an argument\n");
         exit(EXIT_FAILURE);
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index f9ea5f4777f7f1f97221e67ff1a3741347645d82..152397c044c4c42f672cb16e11e1134cd79bf816 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -68,7 +68,7 @@ TAOS *shellInit(struct arguments *args) {
   tsMeterMetaKeepTimer = 3000;
 
   // Connect to the database.
-  TAOS *con = taos_connect(args->host, args->user, args->password, args->database, tsMnodeShellPort);
+  TAOS *con = taos_connect(args->host, args->user, args->password, args->database, args->port);
   if (con == NULL) {
     return con;
   }
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 22ffa78c8138dcf14ed384c88fec27e205dc6b47..0d9458e00c5f3060b80bc45cdf8f0d1ac234ecbd 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -63,7 +63,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
       break;
     case 'P':
       if (arg) {
-        tsMnodeShellPort = atoi(arg);
+        arguments->port = atoi(arg);
       } else {
         fprintf(stderr, "Invalid port\n");
         return -1;
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 8863f4fa46c9b3baa6d9d390c6985ced1ce00758..ac04c593fb3fdaa569bf05ada8ac1d8c8e279ad3 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -61,7 +61,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {
       if (i < argc - 1) {
-        tsMnodeShellPort = atoi(argv[++i]);
+        arguments->port = atoi(argv[++i]);
       } else {
         fprintf(stderr, "option -P requires an argument\n");
         exit(EXIT_FAILURE);