diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index fcd6cc9247d..4087f9aba44 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -825,6 +825,9 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             throw new AgentUnavailableException(-1);
         }
 
+        if (timeout <= 0) {
+            timeout = _wait;
+        }
         assert noDbTxn() : "I know, I know.  Why are we so strict as to not allow txn across an agent call?  ...  Why are we so cruel ... Why are we such a dictator .... Too bad... Sorry...but NO AGENT COMMANDS WRAPPED WITHIN DB TRANSACTIONS!";
 
         Command[] cmds = commands.toCommands();
@@ -1507,9 +1510,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
                 wait = cmd.getWait();
             }
         }
-        if ( wait == 0 ) {
-            wait = _wait;
-        }
         return send(hostId, cmds, wait);
     }