diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index fe231d94ec8..7d53824d050 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -177,6 +177,7 @@ in
         startOn = "mount-failed";
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
             start --no-wait emergency-shell \
               DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
           '';
@@ -191,6 +192,8 @@ in
 
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
+            
             exec < /dev/console > /dev/console 2>&1
 
             cat <<EOF