diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index 61087dc08954..32ca635562dd 100644
--- a/stand/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
@@ -415,6 +415,8 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
 	 */
 	conout = ST->ConOut;
 	conout->Reset(conout, TRUE);
+	/* Explicitly set conout to mode 0, 80x25 */
+	conout->SetMode(conout, 0);
 	conout->EnableCursor(conout, TRUE);
 	conout->ClearScreen(conout);
 
diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
index c6b187d04596..fa65ddde24b9 100644
--- a/stand/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
@@ -577,12 +577,14 @@ gop_autoresize(EFI_GRAPHICS_OUTPUT *gop)
 		}
 	}
 
-	status = gop->SetMode(gop, best_mode);
-	if (EFI_ERROR(status)) {
-		snprintf(command_errbuf, sizeof(command_errbuf),
-		    "gop_autoresize: Unable to set mode to %u (error=%lu)",
-		    mode, EFI_ERROR_CODE(status));
-		return (CMD_ERROR);
+	if (maxdim != 0) {
+		status = gop->SetMode(gop, best_mode);
+		if (EFI_ERROR(status)) {
+			snprintf(command_errbuf, sizeof(command_errbuf),
+			    "gop_autoresize: Unable to set mode to %u (error=%lu)",
+			    mode, EFI_ERROR_CODE(status));
+			return (CMD_ERROR);
+		}
 	}
 	return (CMD_OK);
 }