diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index d971e3ad6dc2a20c241c0ba1ea5aac12dfa878f8..7cc4bbcefa0bf0665354a84012936bfac492fb74 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -721,7 +721,7 @@ int32_t dnodeGetDnodeId() {
 }
 
 void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
-  SRpcConnInfo connInfo;
+  SRpcConnInfo connInfo = {0};
   rpcGetConnInfo(rpcMsg->handle, &connInfo);
 
   SRpcIpSet ipSet = {0};
diff --git a/src/mnode/src/mnodeMain.c b/src/mnode/src/mnodeMain.c
index 96dc70078315ba3ab088fb201088189853f6ec54..5e44ea573129b2fa1a224440dc3a6e2eee556b1a 100644
--- a/src/mnode/src/mnodeMain.c
+++ b/src/mnode/src/mnodeMain.c
@@ -121,8 +121,8 @@ void mnodeCleanupSystem() {
   dnodeFreeMnodeWqueue();
   dnodeFreeMnodeRqueue();
   dnodeFreeMnodePqueue();
-  mnodeCleanupTimer();
   mnodeCleanupComponents(sizeof(tsMnodeComponents) / sizeof(tsMnodeComponents[0]) - 1);
+  mnodeCleanupTimer();
 
   mPrint("mnode is cleaned up");
 }