diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index abeacb5009..1400a4c8ca 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -854,7 +854,11 @@ static int generic_action_ok_file_load(const char *corepath, const char *fullpat
       enum rarch_core_type action_type, enum content_mode_load content_enum_idx)
 {
    content_ctx_info_t content_info = {0};
-   if(runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL))
+   settings_t            *settings = config_get_ptr();
+
+   if(runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL)
+      && !string_is_empty(settings->directory.system)
+      && content_enum_idx == CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU)
    {
       runloop_msg_queue_push(msg_hash_to_str(MSG_FIRMWARE), 200, 100, true);
       RARCH_LOG(msg_hash_to_str(MSG_FIRMWARE));