diff --git a/handlers/main.yml b/handlers/main.yml
index 0dda917..531d85a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -58,6 +58,10 @@
   service:
     name: "slurmd"
     state: restarted
+  retries: 5
+  register: slurmd_restart
+  until: slurmd_restart is success
+  delay: 30
   when:
     - openhpc_slurm_service_started | bool
     - openhpc_enable.batch | default(false) | bool