diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index cfc3a1dbbd5..255488a4b75 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1720,7 +1720,16 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
                 if (cmds != null) {
                     resource.disconnected();
                 }
-
+                if(host == null){
+                    if (cmds != null) {
+                        StartupCommand firstCmd = cmds[0];
+                        host = findHostByGuid(firstCmd.getGuid());
+                        if (host == null) {
+                            host = findHostByGuid(firstCmd.getGuidWithoutResource());
+                        }
+                    }
+                }
+                
                 if (host != null) {
                     /* Change agent status to Alert */
                     _agentMgr.agentStatusTransitTo(host, Status.Event.AgentDisconnected, _nodeId);