diff --git a/cloud/ec2_elb b/cloud/ec2_elb index 6a8a25986ec..1927d6c3a7a 100644 --- a/cloud/ec2_elb +++ b/cloud/ec2_elb @@ -202,7 +202,7 @@ class ElbManager: if instance_state.state == awaited_state: # Check the current state agains the initial state, and only set # changed if they are different. - if instance_state.state != initial_state.state: + if (initial_state is None) or (instance_state.state != initial_state.state): self.changed = True break elif self._is_instance_state_pending(instance_state):