diff --git a/cloud/amazon/ec2_eni.py b/cloud/amazon/ec2_eni.py
index 9e878e7d558..4d08aeb26d0 100644
--- a/cloud/amazon/ec2_eni.py
+++ b/cloud/amazon/ec2_eni.py
@@ -213,9 +213,9 @@ def create_eni(connection, module):
                 except BotoServerError as ex:
                     eni.delete()
                     raise
+                # Wait to allow creation / attachment to finish
+                wait_for_eni(eni, "attached")
             changed = True
-            # Wait to allow creation / attachment to finish
-            wait_for_eni(eni, "attached")
             eni.update()
             
     except BotoServerError as e: