diff --git a/tasks/firewalld_rules.yml b/tasks/firewalld_rules.yml
index b8c7b1c..573210c 100644
--- a/tasks/firewalld_rules.yml
+++ b/tasks/firewalld_rules.yml
@@ -88,4 +88,5 @@
   - name: Set the firewalld default zone.
     command: firewall-cmd --set-default-zone={{ firewalld_default_zone }}
 
+  when: firewalld_enabled
   tags: [ 'iptables', 'firewall', 'firewalld' ]
diff --git a/tasks/main.yml b/tasks/main.yml
index b86f135..1dc306e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,10 +4,6 @@
     - iptables_persistent_enabled
     - ansible_distribution_file_variety == "Debian"
 - import_tasks: firewalld_rules.yml
-  when:
-    - firewalld_enabled
-    - ansible_distribution_file_variety == "RedHat"
+  when: ansible_distribution_file_variety == "RedHat"
 - import_tasks: firewalld_disable.yml
-  when:
-    - firewalld_enabled
-    - ansible_distribution_file_variety == "RedHat"
+  when: ansible_distribution_file_variety == "RedHat"