diff --git a/command_event.c b/command_event.c
index 9a14c29e91..a08b29e32f 100644
--- a/command_event.c
+++ b/command_event.c
@@ -597,8 +597,7 @@ static bool event_init_core(void *data)
       config_load_remap();
 
    /* per-core saves: reset redirection paths */
-   if((settings->sort_savestates_enable || settings->sort_savefiles_enable) 
-         && !content_ctl(CONTENT_CTL_DOES_NOT_NEED_CONTENT, NULL))
+   if((settings->sort_savestates_enable || settings->sort_savefiles_enable))
       rarch_ctl(RARCH_CTL_SET_PATHS_REDIRECT, NULL);
 
    if (!core_ctl(CORE_CTL_RETRO_INIT, NULL))
diff --git a/retroarch.c b/retroarch.c
index bda951dd7c..622b3c2122 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1366,6 +1366,8 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_INIT, NULL);
          return true;
       case RARCH_CTL_SET_PATHS_REDIRECT:
+         if (content_ctl(CONTENT_CTL_DOES_NOT_NEED_CONTENT, NULL))
+            return false;
          set_paths_redirect(global->name.base);
          break;
       case RARCH_CTL_SET_ERROR_ON_INIT: