diff --git a/mgmtsystem/ec2.py b/mgmtsystem/ec2.py
index 1f840937..63ac27f3 100644
--- a/mgmtsystem/ec2.py
+++ b/mgmtsystem/ec2.py
@@ -189,7 +189,7 @@ def stop_vm(self, instance_id):
         instance_id = self._get_instance_id_by_name(instance_id)
         try:
             self.api.stop_instances([instance_id])
-            self._block_until(instance_id, self.states['stopped'])
+            self._block_until(instance_id, self.states['stopped'], timeout=360)
             return True
         except ActionTimedOutError:
             return False