diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 8c1ddf652..45d7bba6e 100644
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -239,3 +239,6 @@
     - ceph_current_status['servicemap'] is defined
     - ceph_current_status['servicemap']['services'] is defined
     - ceph_current_status['servicemap']['services']['rgw'] is defined
+
+- name: populate service facts
+  service_facts:
diff --git a/roles/ceph-infra/handlers/main.yml b/roles/ceph-infra/handlers/main.yml
index 5a9d52410..dc97de47b 100644
--- a/roles/ceph-infra/handlers/main.yml
+++ b/roles/ceph-infra/handlers/main.yml
@@ -4,3 +4,6 @@
     name: firewalld
     state: restarted
     enabled: yes
+  when:
+    - ansible_facts['services']['firewalld.service'] is defined
+    - ansible_facts['services']['firewalld.service']['state'] != 'masked'
\ No newline at end of file