diff --git a/nixos-modules/image/boot/uefi/default.nix b/nixos-modules/image/boot/uefi/default.nix
index 76321daf..bd3427ee 100644
--- a/nixos-modules/image/boot/uefi/default.nix
+++ b/nixos-modules/image/boot/uefi/default.nix
@@ -9,7 +9,7 @@ let
   };
 
   loaderConf = pkgs.writeText "loader.conf" ''
-    timeout 5
+    timeout ${if (config.boot.loader.timeout != null) then toString config.boot.loader.timeout else "menu-force"}
     editor yes
   '';
 
diff --git a/tests/image.nix b/tests/image.nix
index 99a1e5d3..34286311 100644
--- a/tests/image.nix
+++ b/tests/image.nix
@@ -6,6 +6,7 @@ let
 
     nix.settings.experimental-features = [ "nix-command" ];
 
+    boot.loader.timeout = 0;
     boot.initrd.systemd.emergencyAccess = true;
 
     virtualisation.directBoot.enable = false;