diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index e9c88c400ba..abbdc23e1cc 100644
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -922,10 +922,12 @@ public class ClusterManagerImpl implements ClusterManager {
         return true;
     }
 
-    @Override
+    @Override @DB
     public boolean stop() {
         if(_mshostId != null) {
-            _mshostDao.remove(_mshostId);
+            ManagementServerHostVO mshost = _mshostDao.findByMsid(_msId);
+            mshost.setState(ManagementServerHost.State.Down);
+            _mshostDao.update(_mshostId, mshost);
         }
 
         _heartbeatScheduler.shutdownNow();