diff --git a/tasks/acmetool_rh.yml b/tasks/acmetool_rh.yml
index bb5c074..5abb9f3 100644
--- a/tasks/acmetool_rh.yml
+++ b/tasks/acmetool_rh.yml
@@ -11,14 +11,14 @@
     with_items: '{{ letsencrypt_acme_sh_domains }}'
     when:
       - item.standalone is defined
-      - firewalld_enabled
+      - firewalld_enabled is defined and firewalld_enabled
       - letsencrypt_firewalld_http_enabled_on_default_zone
 
   - name: Custom firewalld rule for http
     firewalld: service={{ item.service}} zone={{ item.zone }} permanent={{ item.permanent | default(True) }} state={{ item.state }} immediate=True
     with_items: '{{ letsencrypt_firewalld_services }}'
     when:
-      - firewalld_enabled
+      - firewalld_enabled is defined and firewalld_enabled
       - not letsencrypt_firewalld_http_enabled_on_default_zone
 
   tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]