diff --git a/configuration.c b/configuration.c
index 3011b6a3c3..45f7f8a13f 100644
--- a/configuration.c
+++ b/configuration.c
@@ -3528,8 +3528,7 @@ static config_file_t *open_default_config_file(void)
       goto error;
 
    path_set(RARCH_PATH_CONFIG, conf_path);
-   if (path_is_empty(RARCH_PATH_CONFIG_DEFAULT))
-      path_set(RARCH_PATH_CONFIG_DEFAULT, conf_path);
+   path_set(RARCH_PATH_CONFIG_DEFAULT, conf_path);
 
    return conf;
 
@@ -4011,7 +4010,10 @@ static bool config_load_file(global_t *global,
             DEFAULT_MIDI_OUTPUT);
 
    /* History playlists must stay in default config path */
-   path_config = path_get(RARCH_PATH_CONFIG_DEFAULT);
+   if (!path_is_empty(RARCH_PATH_CONFIG_DEFAULT))
+      path_config = path_get(RARCH_PATH_CONFIG_DEFAULT);
+   else
+      path_config = path_get(RARCH_PATH_CONFIG);
 
    if (string_is_empty(settings->paths.path_content_favorites))
       strlcpy(settings->paths.directory_content_favorites, "default",