diff --git a/roles/kiwix/tasks/kiwix_enable.yml b/roles/kiwix/tasks/kiwix_enable.yml
index cffee2647..dc83709e1 100644
--- a/roles/kiwix/tasks/kiwix_enable.yml
+++ b/roles/kiwix/tasks/kiwix_enable.yml
@@ -35,7 +35,7 @@
     name: kiwix-serve
     enabled: yes
     state: restarted
-  when: kiwix_enabled
+  when: kiwix_enabled | bool
 
 - name: Disable 'kiwix-serve' service
   systemd:
@@ -64,19 +64,19 @@
     dest: /etc/crontab
   when: kiwix_enabled and is_redhat
 
-- name: Restart Apache, so it picks up kiwix.conf
+- name: Restart Apache systemd service ({{ apache_service }})
   systemd:
     name: "{{ apache_service }}"
-    state: restarted
     daemon-reload: yes
+    state: restarted
   when: not nginx_enabled
 
-- name: Restart nginx service
+- name: Restart nginx systemd service
   systemd:
     name: nginx
-    state: restarted
     daemon-reload: yes
-  when: nginx_enabled
+    state: restarted
+  when: nginx_enabled | bool
 
 
 # 5. FINALIZE