diff --git a/Changelog.md b/Changelog.md
index 9fd39057d664cfd993863061ea0ba7daa8ec5953..a7b8585b1c9051dc2767f90b7447fec4d15ae541 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ OpenCore Changelog
 - Fixed unrecognised select `com.apple.recovery.boot` entries
 - Changed NVRAM reset not to erase `BootProtect` boot options
 - Improved boot performance when picker UI is disabled
+- Enforced the use of builtin picker when external fails
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG
diff --git a/Platform/OpenCore/OpenCoreMisc.c b/Platform/OpenCore/OpenCoreMisc.c
index 3197f6e13494e14cd600495c1722366d07ba64eb..61552988a63d93aaa96aa03c1257ef07963c2e43 100644
--- a/Platform/OpenCore/OpenCoreMisc.c
+++ b/Platform/OpenCore/OpenCoreMisc.c
@@ -713,9 +713,15 @@ OcMiscBoot (
 
   if (Interface != NULL) {
     Status = Interface->ShowInteface (Interface, Storage, Context);
+    DEBUG ((DEBUG_WARN, "OC: External interface failure, fallback to builtin - %r\n", Status));
   } else {
+    Status = EFI_UNSUPPORTED;
+  }
+
+  if (EFI_ERROR (Status)) {
     Status = OcRunBootPicker (Context);
   }
+
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "OC: Failed to show boot menu!\n"));
   }