diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 234e4e7572..984ebf282a 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -15,7 +15,7 @@ ConditionPathIsReadWrite=/etc
 ConditionFirstBoot=yes
 
 DefaultDependencies=no
-After=systemd-remount-fs.service systemd-sysusers.service
+After=systemd-remount-fs.service systemd-sysusers.service systemd-tmpfiles-setup.service
 Wants=first-boot-complete.target
 Before=first-boot-complete.target sysinit.target
 Conflicts=shutdown.target