diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel
index 08c0c740..92e3301a 100755
--- a/modules.d/90kernel-modules/installkernel
+++ b/modules.d/90kernel-modules/installkernel
@@ -18,4 +18,4 @@ else
   instmods $drivers
 fi
 
-
+instmods scsi_wait_scan
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 14505edc..04990a84 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -138,6 +138,11 @@ while :; do
     [ -n "$queuetriggered" ] && continue
 
     if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
+
+        modprobe scsi_wait_scan && rmmod scsi_wait_scan
+
+        $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+
         unset queuetriggered
 	for job in /initqueue-settled/*.sh; do
 	    [ -e "$job" ] || break
diff --git a/modules.d/99base/install b/modules.d/99base/install
index 08ca8f0c..f2c1c2b3 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 dracut_install mount mknod mkdir modprobe pidof sleep chroot \
-    sed ls flock cp mv dmesg rm ln
+    sed ls flock cp mv dmesg rm ln rmmod
 if [ ! -e "${initdir}/bin/sh" ]; then
     dracut_install bash
     (ln -s bash "${initdir}/bin/sh" || :)