diff --git a/lib/ansible/modules/cloud/amazon/ec2.py b/lib/ansible/modules/cloud/amazon/ec2.py
index a09442f289..d9ff6caf65 100644
--- a/lib/ansible/modules/cloud/amazon/ec2.py
+++ b/lib/ansible/modules/cloud/amazon/ec2.py
@@ -989,12 +989,12 @@ def enforce_count(module, ec2, vpc):
     # ensure all instances are dictionaries
     all_instances = []
     for inst in instances:
+        warn_if_public_ip_assignment_changed(module, inst)
+
         if not isinstance(inst, dict):
             inst = get_instance_info(inst)
         all_instances.append(inst)
 
-        warn_if_public_ip_assignment_changed(module, inst)
-
     return (all_instances, instance_dict_array, changed_instance_ids, changed)