diff --git a/tasks/zabbix-agent_firewalld_rules.yml b/tasks/zabbix-agent_firewalld_rules.yml
index 094e955..4321596 100644
--- a/tasks/zabbix-agent_firewalld_rules.yml
+++ b/tasks/zabbix-agent_firewalld_rules.yml
@@ -2,7 +2,13 @@
 - name: Manage the zabbix agent firewalld rules
   block:
     - name: Manage the zabbix agent firewall services
-      firewalld: service={{ item.service }} zone={{ item.zone }} permanent={{ item.permanent | default(True) }} state={{ item.state }} immediate=True
+      firewalld:
+        service: '{{ item.service }}'
+        zone: '{{ item.zone }}'
+        permanent: '{{ item.permanent | default(True) }}'
+        state: '{{ item.state }}'
+        immediate: True
       with_items: '{{ zabbix_agent_firewalld_services }}'
 
+  when: firewalld_enabled
   tags: [ zabbix', 'zabbix_agent', 'firewall', 'firewalld', 'iptables', 'iptables_rules' ]