diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -56,9 +56,6 @@
  */
 ENTRY(btext)
 
-	/* Tell the bios to warmboot next time */
-	movw	$0x1234,0x472
-
 	/* Don't trust what the loader gives for rflags. */
 	pushq	$PSL_KERNEL
 	popfq
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1604,11 +1604,20 @@
 	struct region_descriptor r_gdt;
 	size_t kstack0_sz;
 	int late_console;
+	bool efi_boot;
 
 	TSRAW(&thread0, TS_ENTER, __func__, NULL);
 
 	kmdp = init_ops.parse_preload_data(modulep);
 
+	efi_boot = preload_search_info(kmdp, MODINFO_METADATA |
+	    MODINFOMD_EFI_MAP) != NULL;
+
+	if (!efi_boot) {
+		/* Tell the bios to warmboot next time */
+		atomic_store_short((u_short *)0x472, 0x1234);
+	}
+
 	physfree += ucode_load_bsp(physfree + KERNBASE);
 	physfree = roundup2(physfree, PAGE_SIZE);
 
@@ -1760,8 +1769,7 @@
 	 * Once bootblocks have updated, we can test directly for
 	 * efi_systbl != NULL here...
 	 */
-	if (preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP)
-	    != NULL)
+	if (efi_boot)
 		vty_set_preferred(VTY_VT);
 
 	TUNABLE_INT_FETCH("hw.ibrs_disable", &hw_ibrs_disable);