diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 380ce651332135c4fc9fab112e8ac66a23b722c8..6abdab4880f837c505eeba10b0dd9af6c1b86974 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -29,6 +29,7 @@
 #include "ttimer.h"
 #include "tscProfile.h"
 
+static char clusterDefaultId[] = "clusterDefaultId";
 static bool validImpl(const char* str, size_t maxsize) {
   if (str == NULL) {
     return false;
@@ -193,11 +194,10 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass,
 
     tscBuildAndSendRequest(pSql, NULL);
     tsem_wait(&pSql->rspSem);
-
-    pSql->pTscObj->pClusterInfo = (SClusterInfo *)tscAcquireClusterInfo(pSql->pTscObj->clusterId);
-    if (pSql->pTscObj->pClusterInfo == NULL) {
-      assert(pSql->res.code != TSDB_CODE_SUCCESS);
+    if (0 == strlen(pSql->pTscObj->clusterId)) {
+      memcpy(pSql->pTscObj->clusterId, clusterDefaultId, strlen(clusterDefaultId));
     } 
+    pSql->pTscObj->pClusterInfo = (SClusterInfo *)tscAcquireClusterInfo(pSql->pTscObj->clusterId);
     if (pSql->res.code != TSDB_CODE_SUCCESS) {
       terrno = pSql->res.code;
       if (terrno ==TSDB_CODE_RPC_FQDN_ERROR) {
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index bc8d0db4858bff7f38fdfb2b463d583bcac06fc2..3b3770dae978f079576799190771b9c628cafb31 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -134,10 +134,7 @@ void tscClusterInfoDestroy(SClusterInfo *pObj) {
 void *tscAcquireClusterInfo(const char *clusterId) {
   pthread_mutex_lock(&clusterMutex);
   size_t len = strlen(clusterId);
-  if (len == 0) {
-    pthread_mutex_unlock(&clusterMutex);
-    return NULL;
-  }
+
   SClusterInfo *pObj   = NULL;
   SClusterInfo **ppObj = taosHashGet(tscClusterMap, clusterId, len); 
   if (ppObj == NULL || *ppObj == NULL) {