diff --git a/tasks/main.yml b/tasks/main.yml
index d163601..5f5b1f9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,9 +15,9 @@
 - include: service.yml
 
 - include: cluster.yml
-  when: 'rabbitmq_create_cluster and (ansible_hostname != rabbitmq_cluster_master) and (ansible_fqdn != rabbitmq_cluster_master)'
+  when: 'rabbitmq_create_cluster and (ansible_hostname != rabbitmq_cluster_master) and (ansible_fqdn != rabbitmq_cluster_master) and ((ec2_public_dns_name | default('')) != rabbitmq_cluster_master)'
 
 - include: rabbitmq.yml
-  when: 'not rabbitmq_create_cluster or (ansible_hostname == rabbitmq_cluster_master) or (ansible_fqdn != rabbitmq_cluster_master)'
+  when: 'not rabbitmq_create_cluster or (ansible_hostname == rabbitmq_cluster_master) or (ansible_fqdn == rabbitmq_cluster_master) or ((ec2_public_dns_name | default('')) == rabbitmq_cluster_master)'
 
 - meta: flush_handlers