diff --git a/buildroot-external/overlay/etc/systemd/system/mnt-data.mount b/buildroot-external/overlay/etc/systemd/system/mnt-data.mount
index 9ff5b8b09..2c8fb8ac3 100644
--- a/buildroot-external/overlay/etc/systemd/system/mnt-data.mount
+++ b/buildroot-external/overlay/etc/systemd/system/mnt-data.mount
@@ -1,5 +1,8 @@
 [Unit]
 Description=Hassio data partition
+DefaultDependencies=no
+Before=umount.target
+Conflicts=umount.target
 
 [Mount]
 What=LABEL=hassio-data