diff --git a/tasks/task_content.c b/tasks/task_content.c
index 6aed80dd5f..f3dcb8f891 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1698,7 +1698,6 @@ bool task_push_load_content_with_current_core_from_companion_ui(
    return true;
 }
 
-#ifdef HAVE_MENU
 bool task_push_load_content_with_core_from_menu(
       const char *fullpath,
       content_ctx_info_t *content_info,
@@ -1716,9 +1715,11 @@ bool task_push_load_content_with_core_from_menu(
       return false;
    }
 
+#ifdef HAVE_MENU
    /* Push quick menu onto menu stack */
    if (type != CORE_TYPE_DUMMY)
       menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
+#endif
 
    return true;
 }
@@ -1740,14 +1741,16 @@ bool task_push_load_subsystem_with_core_from_menu(
       return false;
    }
 
+#ifdef HAVE_MENU
    /* Push quick menu onto menu stack */
    if (type != CORE_TYPE_DUMMY)
       menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
+#endif
 
    return true;
 }
 
-#endif
+
 
 void content_get_status(
       bool *contentless,
diff --git a/tasks/task_content.h b/tasks/task_content.h
index 7055307181..8e5d552d95 100644
--- a/tasks/task_content.h
+++ b/tasks/task_content.h
@@ -97,6 +97,7 @@ bool task_push_load_content_from_playlist_from_menu(
       content_ctx_info_t *content_info,
       retro_task_callback_t cb,
       void *user_data);
+#endif
 
 bool task_push_load_content_with_core_from_menu(
       const char *fullpath,
@@ -110,7 +111,6 @@ bool task_push_load_subsystem_with_core_from_menu(
       enum rarch_core_type type,
       retro_task_callback_t cb,
       void *user_data);
-#endif
 
 RETRO_END_DECLS
 
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 3236253590..77f786134a 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -86,7 +86,6 @@ static void netplay_crc_scan_callback(void *task_data,
       return;
    }
 
-#ifdef HAVE_MENU
    /* regular core with content file */
    if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
       && !state->contentless && !state->current)
@@ -103,12 +102,17 @@ static void netplay_crc_scan_callback(void *task_data,
                state->content_path, &content_info,
                CORE_TYPE_PLAIN, NULL, NULL);
       else
-         task_push_load_content_with_new_core_from_menu(
-               state->core_path, state->content_path,
+      {
+         task_push_load_new_core(state->core_path, NULL,
                &content_info, CORE_TYPE_PLAIN, NULL, NULL);
+         task_push_load_content_with_core_from_menu(
+               state->content_path, &content_info,
+               CORE_TYPE_PLAIN, NULL, NULL);
+      }
+
    }
    else
-#endif
+
    /* contentless core */
    if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
       && state->contentless)