diff --git a/src/vnode/main/src/vnodeMain.c b/src/vnode/main/src/vnodeMain.c
index 1ac57089e7..d852d41561 100644
--- a/src/vnode/main/src/vnodeMain.c
+++ b/src/vnode/main/src/vnodeMain.c
@@ -187,6 +187,7 @@ void vnodeRelease(void *pVnodeRaw) {
   if (tsOpennedVnodes <= 0) {
     taosCleanUpIntHash(tsDnodeVnodesHash);
     vnodeModuleInit = PTHREAD_ONCE_INIT;
+    tsDnodeVnodesHash = NULL;
   }
 }
 
@@ -240,10 +241,7 @@ static void vnodeBuildVloadMsg(char *pNode, void * param) {
 }
 
 static void vnodeCleanUp(SVnodeObj *pVnode) {
-  if (pVnode->status == VN_STATUS_DELETING) {
-    // fix deadlock occured while close system
-    taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
-  }
+  taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
   
   //syncStop(pVnode->sync);
   tsdbCloseRepo(pVnode->tsdb);