diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index af653f59c88..e7c9d84033c 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -193,8 +193,8 @@ in
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             ${udev}/sbin/udevadm control --env=STARTUP=1
             ${udev}/sbin/udevadm trigger
-            ${udev}/sbin/udevadm control --env=STARTUP=
             ${udev}/sbin/udevadm settle # wait for udev to finish
+            ${udev}/sbin/udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
           '';
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 76c2be8a048..5f882f67aa0 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -116,8 +116,8 @@ mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger
-udevadm control --env=STARTUP=
 udevadm settle
+udevadm control --env=STARTUP=
 
 echo "starting device mapper and LVM..."
 lvm vgscan