diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
index 8b8c09b7..5fc77f4e 100755
--- a/modules.d/04watchdog/module-setup.sh
+++ b/modules.d/04watchdog/module-setup.sh
@@ -22,5 +22,6 @@ install() {
     inst_hook pre-pivot 99 "$moddir/watchdog.sh"
     inst_hook cleanup   00 "$moddir/watchdog.sh"
     inst_hook cleanup   99 "$moddir/watchdog.sh"
+    inst_hook emergency 02 "$moddir/watchdog-stop.sh"
 }
 
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index e63f3f04..1ee671e0 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -856,8 +856,6 @@ emergency_shell()
             fi
             [ -c "$_ctty" ] || _ctty=/dev/tty1
             strstr "$(setsid --help 2>/dev/null)" "ctty" && CTTY="-c"
-        # stop watchdog
-            echo 'V' > /dev/watchdog
             setsid $CTTY /bin/sh -i -l 0<$_ctty 1>$_ctty 2>&1
         fi
     else