diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 77bb79d214a..069819251c8 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -856,8 +856,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             Request req = new Request(hostId, _nodeId, new CheckHealthCommand(), true);
             req.setSequence(agent.getNextSequence());
             Answer[] answers = agent.send(req, 50 * 1000);
-            if (answers != null && answers[0] != null) {
-                Status status = answers[0].getResult() ? Status.Up : Status.Down;
+            if (answers != null && answers[0] != null && answers[0].getResult()) {
+                Status status = Status.Up;
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("agent (" + hostId + ") responded to checkHeathCommand, reporting that agent is " + status);
                 }
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index cf0bd0bcba5..407e081a14a 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -185,19 +185,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
         if (host.getType() != Host.Type.Routing) {
             return;
         }
-        // need to wait 60 seconds to make sure storage heartbeat check correct
-        long begin = System.currentTimeMillis();
-        while ( true ) {
-            try {
-                    Thread.sleep(60*1000);
-            } catch (InterruptedException e) {
-            }
-            long now = System.currentTimeMillis();
-            if( (now - begin) > 60*1000) {
-                break;
-            }
-        }
-
         s_logger.warn("Scheduling restart for VMs on host " + host.getId());
 
         final List<VMInstanceVO> vms = _instanceDao.listByHostId(host.getId());