diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index d01160a..fc6df72 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -437,7 +437,7 @@
 	if ((gbb->flags & GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY) &&
 	    !ctrl_d_pressed) {
 		VBDEBUG(("VbBootDeveloper() - defaulting to legacy\n"));
-		VbTryLegacy(1);
+		VbTryLegacy(allow_legacy);
 	}
 
 	/* Timeout or Ctrl+D; attempt loading from fixed disk */
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 3070bae..fe0a46a 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -288,7 +288,8 @@
 
 	/* Proceed to legacy after timeout if GBB flag set */
 	ResetMocks();
-	gbb.flags |= GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY;
+	gbb.flags |= GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY |
+		     GBB_FLAG_FORCE_DEV_BOOT_LEGACY;
 	TEST_EQ(VbBootDeveloper(&cparams, &lkp), 1002, "Timeout");
 	TEST_EQ(vbexlegacy_called, 1, "  try legacy");