diff --git a/handlers/main.yml b/handlers/main.yml
index f3b5adb..5857357 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -26,6 +26,7 @@
   wait_for_connection:
     delay: 5
     timeout: 300
+  when: (require_reboot | bool) or (network_restart_enabled | bool)
   listen:
     - __network_restart
     - __host_reboot