diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 914d0f7c14e..9393a64f001 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -15,6 +15,10 @@ Conflicts=shutdown.target
 After=sysroot.mount
 Before=initrd-root-fs.target shutdown.target
 ConditionVirtualization=!container
+ConditionDirectoryNotEmpty=|/usr/lib/repart.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/repart.d
+ConditionDirectoryNotEmpty=|/etc/repart.d
+ConditionDirectoryNotEmpty=|/run/repart.d
 
 [Service]
 Type=oneshot