diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 101bd9341c..fec1060042 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -941,7 +941,7 @@ void taos_init_imp(void) {
     tscInitRes = TSDB_CODE_OUT_OF_MEMORY;
     return;
   }
-//  taosHashSetFreeFp(appInfo.pInstMap, destroyAppInst);   avoid heap use after free
+  taosHashSetFreeFp(appInfo.pInstMap, destroyAppInst);
   deltaToUtcInitOnce();
 
   char logDirName[64] = {0};
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index d77b8dcbb7..80ab094eaf 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -77,7 +77,10 @@ bool chkRequestKilled(void* param) {
   return killed;
 }
 
-void cleanupAppInfo() { taosHashCleanup(appInfo.pInstMap); }
+void cleanupAppInfo() {
+  taosHashCleanup(appInfo.pInstMap);
+  taosHashCleanup(appInfo.pInstMapByClusterId);
+}
 
 static int32_t taosConnectImpl(const char* user, const char* auth, const char* db, __taos_async_fn_t fp, void* param,
                                SAppInstInfo* pAppInfo, int connType, STscObj** pTscObj);
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 1c1fff9b7b..829c696c7c 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -73,6 +73,8 @@ void taos_cleanup(void) {
     tscWarn("failed to cleanup task queue");
   }
 
+  tmqMgmtClose();
+
   int32_t id = clientReqRefPool;
   clientReqRefPool = -1;
   taosCloseRef(id);
@@ -87,9 +89,6 @@ void taos_cleanup(void) {
   tscDebug("rpc cleanup");
 
   taosConvDestroy();
-
-  tmqMgmtClose();
-
   DestroyRegexCache();
 
   tscInfo("all local resources released");