diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index e8c3413fc..5ab041170 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -134,6 +134,9 @@ def run():
 
     :return:
     """
+    if libcalamares.globalstorage.value("bootLoader") is None:
+        return None
+
     partitions = libcalamares.globalstorage.value("partitions")
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
     branding = libcalamares.globalstorage.value("branding")