diff --git a/elb_instance.py b/elb_instance.py
index 6116207866b..51ec03d5702 100644
--- a/elb_instance.py
+++ b/elb_instance.py
@@ -144,8 +144,9 @@ def deregister(self, wait, timeout):
             # already OutOfService is being deregistered.
             self.changed = True
 
-        for lb in self.lbs:
-            self._await_elb_instance_state(lb, 'Deregistered', timeout)
+        if wait:
+            for lb in self.lbs:
+                self._await_elb_instance_state(lb, 'Deregistered', timeout)
 
     def register(self, wait, enable_availability_zone, timeout):
         """Register the instance for all ELBs and wait for the ELB
@@ -176,8 +177,9 @@ def register(self, wait, enable_availability_zone, timeout):
 
             self.changed = True
 
-        for lb in self.lbs:
-            self._await_elb_instance_state(lb, 'InService', timeout)
+        if wait:
+            for lb in self.lbs:
+                self._await_elb_instance_state(lb, 'InService', timeout)
 
     @AWSRetry.jittered_backoff()
     def _describe_elbs(self, **params):