diff --git a/archinstall/lib/bootloader/utils.py b/archinstall/lib/bootloader/utils.py
index e40b0b0f..ed761722 100644
--- a/archinstall/lib/bootloader/utils.py
+++ b/archinstall/lib/bootloader/utils.py
@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from enum import Enum, auto
 from pathlib import Path
 
+from archinstall.lib.hardware import SysInfo
 from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
 from archinstall.lib.models.device import DiskLayoutConfiguration
 
@@ -22,7 +23,6 @@ class BootloaderValidationFailure:
 def validate_bootloader_layout(
 	bootloader_config: BootloaderConfiguration | None,
 	disk_config: DiskLayoutConfiguration | None,
-	is_uefi: bool,
 ) -> BootloaderValidationFailure | None:
 	"""Validate bootloader configuration against disk layout.
 
@@ -37,7 +37,7 @@ def validate_bootloader_layout(
 	if bootloader == Bootloader.NO_BOOTLOADER:
 		return None
 
-	if bootloader.is_uefi_only() and not is_uefi:
+	if bootloader.is_uefi_only() and not SysInfo.has_uefi():
 		return BootloaderValidationFailure(
 			kind=BootloaderValidationFailureKind.BootloaderRequiresUefi,
 			description=f'{bootloader.value} requires a UEFI system.',
diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py
index e961b5e7..e327b388 100644
--- a/archinstall/lib/global_menu.py
+++ b/archinstall/lib/global_menu.py
@@ -488,7 +488,7 @@ class GlobalMenu(AbstractMenu[None]):
 			if efi_partition.fs_type is None or not efi_partition.fs_type.is_fat():
 				return 'ESP must be formatted as a FAT filesystem'
 
-		if failure := validate_bootloader_layout(bootloader_config, disk_config, self._uefi):
+		if failure := validate_bootloader_layout(bootloader_config, disk_config):
 			return failure.description
 
 		return None
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index c65c0843..19560d75 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1472,7 +1472,6 @@ class Installer:
 			if failure := validate_bootloader_layout(
 				BootloaderConfiguration(bootloader=Bootloader.Limine, uki=uki_enabled),
 				self._disk_config,
-				SysInfo.has_uefi(),
 			):
 				raise DiskError(failure.description)
 
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index 32198c9b..5cdcdad9 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -11,7 +11,6 @@ from archinstall.lib.disk.filesystem import FilesystemHandler
 from archinstall.lib.disk.utils import disk_layouts
 from archinstall.lib.general.general_menu import PostInstallationAction, select_post_installation
 from archinstall.lib.global_menu import GlobalMenu
-from archinstall.lib.hardware import SysInfo
 from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
 from archinstall.lib.menu.util import delayed_warning
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
@@ -218,7 +217,6 @@ def main(arch_config_handler: ArchConfigHandler | None = None) -> None:
 	if failure := validate_bootloader_layout(
 		arch_config_handler.config.bootloader_config,
 		arch_config_handler.config.disk_config,
-		SysInfo.has_uefi(),
 	):
 		error(failure.description)
 		return