diff --git a/units/emergency.service b/units/emergency.service
index 8745d101c7f..0014c263b40 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,6 +10,8 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Wants=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 ExecStart=/bin/sh