diff --git a/defaults/initrd.d/00-zfs.sh b/defaults/initrd.d/00-zfs.sh
index 3541e58..7df7056 100755
--- a/defaults/initrd.d/00-zfs.sh
+++ b/defaults/initrd.d/00-zfs.sh
@@ -2,6 +2,7 @@
 
 . /etc/initrd.d/00-common.sh
 . /etc/initrd.d/00-fsdev.sh
+. /etc/initrd.d/00-devmgr.sh
 
 _is_zfs() {
     # Note: this only works after zfs_real_root_init
@@ -101,6 +102,8 @@ zfs_start_volumes() {
             fi
         fi
     fi
+
+    is_udev && udevadm settle
 }
 
 # Initialize the zfs root filesystem device and
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index aecf8c4..7db10f4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -114,9 +114,6 @@ start_volumes() {
         fi
     fi
 
-    # If zfs is enabled, this will initialize the volumes
-    zfs_start_volumes
-
     is_udev && udevadm settle
 }
 
diff --git a/defaults/linuxrc b/defaults/linuxrc
index f109153..1ae5208 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -270,6 +270,7 @@ start_iscsi
 is_mdev && setup_md_device
 
 start_volumes
+zfs_start_volumes
 
 setup_keymap