diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index d33dc2de7df..5adb4ec7a6f 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1695,6 +1695,15 @@ 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 */