diff --git a/units/tmp.mount b/units/tmp.mount
index 0b0d6ae56d..94c41c29ba 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -8,7 +8,9 @@
 [Unit]
 Description=Temporary Directory
 Documentation=man:hier(7)
-Before=local-fs.target
+DefaultDependencies=no
+Conflicts=umount.target
+Before=local-fs.target umount.target
 
 [Mount]
 What=tmpfs