diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
index f97f99a966..aa4b3e7357 100644
--- a/units/systemd-random-seed.service.in
+++ b/units/systemd-random-seed.service.in
@@ -14,7 +14,8 @@ DefaultDependencies=no
 RequiresMountsFor=@RANDOM_SEED@
 Conflicts=shutdown.target
 After=systemd-remount-fs.service
-Before=shutdown.target
+Before=first-boot-complete.target shutdown.target
+Wants=first-boot-complete.target
 ConditionVirtualization=!container
 
 [Service]