diff --git a/units/quotaon@.service.in b/units/quotaon@.service.in
index 136060a9a17..23f365ae2c9 100644
--- a/units/quotaon@.service.in
+++ b/units/quotaon@.service.in
@@ -14,9 +14,9 @@ Documentation=man:quotaon(8)
 ConditionPathExists={{QUOTAON}}
 ConditionPathExists=!/etc/initrd-release
 
-After=%i.mount
-After=systemd-quotacheck@%i.service
 DefaultDependencies=no
+BindsTo=%i.mount
+After=systemd-quotacheck@%i.service %i.mount
 Before=shutdown.target
 Conflicts=shutdown.target
 
diff --git a/units/systemd-quotacheck@.service.in b/units/systemd-quotacheck@.service.in
index dddce2ee832..f2b8db7abb8 100644
--- a/units/systemd-quotacheck@.service.in
+++ b/units/systemd-quotacheck@.service.in
@@ -15,6 +15,7 @@ ConditionPathExists={{QUOTACHECK}}
 ConditionPathExists=!/etc/initrd-release
 
 DefaultDependencies=no
+BindsTo=%i.mount
 After=%i.mount
 Before=shutdown.target
 Conflicts=shutdown.target