diff --git a/tasks/firewalld.yml b/tasks/firewalld.yml
index efebf10..157981a 100644
--- a/tasks/firewalld.yml
+++ b/tasks/firewalld.yml
@@ -1,7 +1,11 @@
 ---
 - name: disable firewalld
-  systemd:
+  service:
     name: firewalld
     state: stopped
     enabled: false
   become: true
+  register: service_stop
+  failed_when: 
+    - '"Could not find the requested service" not in service_stop.msg'
+    - service_stop.rc != 0