diff --git a/command.c b/command.c
index 548c75a279..86a42a3c06 100644
--- a/command.c
+++ b/command.c
@@ -1350,15 +1350,6 @@ static bool event_init_content(void)
 
    content_get_status(&contentless, &is_inited);
 
-   if (contentless)
-   {
-#ifdef HAVE_NETWORKING
-      if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
-         RARCH_ERR("%s\n", msg_hash_to_str(MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY));
-#endif
-      return true;
-   }
-
    command_event_set_savestate_auto_index();
 
    if (event_load_save_files())
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 00ac723ceb..5a154095d9 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -71,7 +71,7 @@ static void netplay_crc_scan_callback(void *task_data,
    else if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path) &&
       string_is_equal(state->content_path, "N/A"))
    {
-      printf("Content: %s Core: %s\n", state->content_path, state->core_path);
+      command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
       task_push_content_load_default(
             state->core_path, NULL,
             &content_info,