diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index cf0f38243e..35b25cb85a 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -138,8 +138,7 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) {
     if (vnode == NULL) {
       r = taos_counter_delete(tsInsertCounter, keys[i]);
       if (r) {
-        dError("failed to delete key:%s", keys[i]);
-        return;
+        dError("failed to delete monitor sample key:%s", keys[i]);
       }
     }
   }
diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c
index 68a851569c..ce0b2b59e0 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c
@@ -135,7 +135,7 @@ void dmSendMonitorReport() {
 }
 
 void dmMonitorCleanExpiredSamples() {
-  if (!tsEnableMonitor) return;
+  if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return;
   dTrace("clean monitor expired samples");
 
   SDnode *pDnode = dmInstance();