diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 9feb02e72..0a86899bc 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -282,10 +282,12 @@ def run():
 
     :return:
     """
-    if libcalamares.globalstorage.value("bootLoader") is None:
+    
+    fw_type = libcalamares.globalstorage.value("firmwareType")
+    
+    if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
         return None
 
-    fw_type = libcalamares.globalstorage.value("firmwareType")
     prepare_bootloader(fw_type)
 
     return None