diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 035b29c1dc..5d1c64f9cd 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2340,13 +2340,9 @@ static int action_ok_rpl_entry(const char *path,
 static int action_ok_start_core(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   /* No content needed for this core, load core immediately. */
-   if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
-      return generic_action_ok_file_load(NULL, NULL,
-            CORE_TYPE_PLAIN,
-            CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU);
-
-   return 0;
+   return generic_action_ok_file_load(NULL, NULL,
+         CORE_TYPE_PLAIN,
+         CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU);
 }
 
 
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 8de15975d0..a70cfe9f1e 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1375,8 +1375,11 @@ static int mui_list_push(void *data, void *userdata,
             menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
          }
 
-         entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
-         menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+         if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
+         {
+            entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
+            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+         }
 
          entry.enum_idx      = MENU_ENUM_LABEL_START_NET_RETROPAD;
          menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 7c0b2e1f2d..6621b8a80b 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3122,8 +3122,11 @@ static int xmb_list_push(void *data, void *userdata,
             menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
          }
 
-         entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
-         menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+         if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
+         {
+            entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
+            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+         }
 
          entry.enum_idx      = MENU_ENUM_LABEL_START_NET_RETROPAD;
          menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index e33ace84cd..0a451ca115 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3920,8 +3920,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                menu_displaylist_parse_settings_enum(menu, info,
                      MENU_ENUM_LABEL_CONTENT_SETTINGS,
                      PARSE_ACTION, false);
-            menu_displaylist_parse_settings_enum(menu, info,
-                  MENU_ENUM_LABEL_START_CORE, PARSE_ACTION, false);
+
+            if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
+               menu_displaylist_parse_settings_enum(menu, info,
+                     MENU_ENUM_LABEL_START_CORE, PARSE_ACTION, false);
 
             menu_displaylist_parse_settings_enum(menu, info,
                   MENU_ENUM_LABEL_START_NET_RETROPAD, PARSE_ACTION, false);