diff --git a/paths.c b/paths.c
index f18046a70c..04ca8e897f 100644
--- a/paths.c
+++ b/paths.c
@@ -651,6 +651,7 @@ void path_clear(enum rarch_path_type type)
 
 void path_clear_all(void)
 {
+   path_clear(RARCH_PATH_CONTENT);
    path_clear(RARCH_PATH_CONFIG);
    path_clear(RARCH_PATH_CONFIG_APPEND);
    path_clear(RARCH_PATH_CORE_OPTIONS);
diff --git a/runloop.c b/runloop.c
index a7f5841bef..deb029688d 100644
--- a/runloop.c
+++ b/runloop.c
@@ -741,7 +741,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
             rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);
             rarch_ctl(RARCH_CTL_UNSET_UPS_PREF, NULL);
             rarch_ctl(RARCH_CTL_UNSET_PATCH_BLOCKED, NULL);
-            path_clear(RARCH_PATH_CONTENT);
             runloop_overrides_active   = false;
 
             core_unset_input_descriptors();