diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 5f7cf96358..9d3057d75c 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -4165,17 +4165,17 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
 #endif
       case MENU_SAVEFILE_DIR_PATH:
          if (action == MENU_ACTION_START)
-            *g_extern.savefile_dir = '\0';
+            strlcpy(g_extern.savefile_dir, g_defaults.sram_dir, sizeof(g_extern.savefile_dir));
          break;
 #ifdef HAVE_OVERLAY
       case MENU_OVERLAY_DIR_PATH:
          if (action == MENU_ACTION_START)
-            *g_extern.overlay_dir = '\0';
+            strlcpy(g_extern.overlay_dir, g_defaults.overlay_dir, sizeof(g_extern.overlay_dir));
          break;
 #endif
       case MENU_SAVESTATE_DIR_PATH:
          if (action == MENU_ACTION_START)
-            *g_extern.savestate_dir = '\0';
+            strlcpy(g_extern.savestate_dir, g_defaults.savestate_dir, sizeof(g_extern.savestate_dir));
          break;
       case MENU_LIBRETRO_DIR_PATH:
          if (action == MENU_ACTION_START)
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 78539f22e0..1901eab0f5 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -574,8 +574,6 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
             fill_pathname_join(g_defaults.savestate_dir, path, "savestates", sizeof(g_defaults.savestate_dir));
             fill_pathname_join(g_defaults.sram_dir, path, "savefiles", sizeof(g_defaults.sram_dir));
             fill_pathname_join(g_defaults.system_dir, path, "system", sizeof(g_defaults.system_dir));
-            args->sram_path  = g_defaults.sram_dir;
-            args->state_path = g_defaults.savestate_dir;
          }
       }
    }
diff --git a/settings.c b/settings.c
index b9002a0ec4..4dc5c68d59 100644
--- a/settings.c
+++ b/settings.c
@@ -1116,7 +1116,7 @@ bool config_load_file(const char *path, bool set_defaults)
    if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str)))
    {
       if (!strcmp(tmp_str, "default"))
-         *g_extern.savefile_dir = '\0';
+         strlcpy(g_extern.savefile_dir, g_defaults.sram_dir, sizeof(g_extern.savefile_dir));
       else if (path_is_directory(tmp_str))
       {
          strlcpy(g_extern.savefile_dir, tmp_str, sizeof(g_extern.savefile_dir));
@@ -1130,7 +1130,7 @@ bool config_load_file(const char *path, bool set_defaults)
    if (!g_extern.has_set_state_path && config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str)))
    {
       if (!strcmp(tmp_str, "default"))
-         *g_extern.savestate_dir = '\0';
+         strlcpy(g_extern.savestate_dir, g_defaults.savestate_dir, sizeof(g_extern.savestate_dir));
       else if (path_is_directory(tmp_str))
       {
          strlcpy(g_extern.savestate_dir, tmp_str, sizeof(g_extern.savestate_dir));