diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 6983188ba34..8ed13bc683c 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -113,7 +113,8 @@ const char *
 bootpart_type(const char *scheme, const char **mountpoint)
 {
 
-	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
+	if (strcmp(x86_bootmethod(), "UEFI") == 0 ||
+	    getenv("WORKAROUND_HYBRID")) {
 		*mountpoint = "/boot/efi";
 		return ("efi");
 	}