diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 131edb1e54..b25777f306 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -185,3 +185,14 @@
 
 - name: Restart debuginfod
   service: name=debuginfod state=restarted
+
+# This is allowed to fail when the zabbix agent is not found
+# as it may be triggered from hosts without the zabbix_agent role
+- name: Restart zabbix agent
+  ansible.builtin.systemd:
+    name: zabbix-agent
+    state: restarted
+  register: zabbix_restart
+  failed_when:
+    - zabbix_restart.failed
+    - "'Could not find' not in zabbix_restart.msg"
diff --git a/roles/zabbix/zabbix_agent/handlers/main.yml b/roles/zabbix/zabbix_agent/handlers/main.yml
index a0448dac71..8383f1f782 100644
--- a/roles/zabbix/zabbix_agent/handlers/main.yml
+++ b/roles/zabbix/zabbix_agent/handlers/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: Restart zabbix agent
-  service: name=zabbix-agent state=restarted
-
 - name: Reload custom selinux files
   ansible.builtin.shell: /usr/sbin/semodule -u "/etc/selinux/centos/centos-zabbix-agent.pp"
   when: ansible_selinux.mode == "enforcing"