diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 563a42cdbe7..06931c9146b 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -823,7 +823,9 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
                         s_logger.debug("Cant not find host " + agent.getId());
                     }
                 } else {
-                    agentStatusTransitTo(host, Event.ManagementServerDown, _nodeId);
+                	if (!agent.forForward()) {
+                		agentStatusTransitTo(host, Event.ManagementServerDown, _nodeId);
+                	}
                 }
             }
         }