diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 3b4c9e554..fa3a3c251 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -237,6 +237,9 @@ def run():
 
     :return:
     """
+    if libcalamares.globalstorage.value("bootLoader") is None:
+        return None
+
     fw_type = libcalamares.globalstorage.value("firmwareType")
     prepare_bootloader(fw_type)