diff --git a/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper b/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
index 8d7e1dd7bb..273d800ecf 100755
--- a/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
+++ b/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
@@ -62,6 +62,10 @@ do_stop() {
 
 BOOT_DEVICE=$(boot_device)
 
+if test -z "$BOOT_DEVICE" || ! test -e "$BOOT_DEVICE"; then
+    do_stop
+fi
+
 # Assign to QUERY_SELECTOR an option that can be passed as a query selector
 # to udevadm info --query commands.
 if using_fromiso ; then