diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index 643cd085b..f90b276b0 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -51,7 +51,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
             cryptdevice_params = [
                 "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
                                                     partition["luksMapperName"]),
-                "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
+                "root=/dev/mapper/{!s}".format(partition["luksMapperName"]),
+                # Fix for unbootable system with dracut --nohostonly
+                "rd.luks.uuid={!s}".format(partition["luksUuid"])
             ]
 
     kernel_params = ["quiet"]