diff --git a/general.h b/general.h
index cc142332ed..c873aa4e7a 100644
--- a/general.h
+++ b/general.h
@@ -105,7 +105,6 @@ enum basic_event
    RARCH_CMD_REWIND_TOGGLE,
    RARCH_CMD_AUTOSAVE_DEINIT,
    RARCH_CMD_AUTOSAVE_INIT,
-   RARCH_CMD_AUTOSAVE,
    RARCH_CMD_AUDIO_STOP,
    RARCH_CMD_AUDIO_START,
    RARCH_CMD_OVERLAY_INIT,
diff --git a/retroarch.c b/retroarch.c
index 15d5fa0e89..7b0f8e6de3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2250,14 +2250,11 @@ void rarch_main_command(unsigned cmd)
 #endif
          break;
       case RARCH_CMD_AUTOSAVE_INIT:
+         rarch_main_command(RARCH_CMD_AUTOSAVE_DEINIT);
 #ifdef HAVE_THREADS
          init_autosave();
 #endif
          break;
-      case RARCH_CMD_AUTOSAVE:
-         rarch_main_command(RARCH_CMD_AUTOSAVE_DEINIT);
-         rarch_main_command(RARCH_CMD_AUTOSAVE_INIT);
-         break;
       case RARCH_CMD_AUDIO_STOP:
          if (!driver.audio_data)
             return;
diff --git a/settings_data.c b/settings_data.c
index ff9144620e..81f8b64084 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -2326,7 +2326,7 @@ rarch_setting_t *setting_data_get_list(void)
       CONFIG_UINT(g_settings.rewind_granularity,         "rewind_granularity",         "Rewind Granularity",         rewind_granularity, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(1, 32768, 1, true, false)
       CONFIG_BOOL(g_settings.block_sram_overwrite,       "block_sram_overwrite",       "SRAM Block overwrite",       block_sram_overwrite, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
 #ifdef HAVE_THREADS
-      CONFIG_UINT(g_settings.autosave_interval,          "autosave_interval",          "SRAM Autosave",          autosave_interval, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 0, 10, true, false) WITH_CMD(RARCH_CMD_AUTOSAVE) WITH_FLAGS(SD_FLAG_CMD_APPLY_AUTO)
+      CONFIG_UINT(g_settings.autosave_interval,          "autosave_interval",          "SRAM Autosave",          autosave_interval, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 0, 10, true, false) WITH_CMD(RARCH_CMD_AUTOSAVE_INIT) WITH_FLAGS(SD_FLAG_CMD_APPLY_AUTO)
 #endif
       CONFIG_BOOL(g_settings.video.disable_composition,  "video_disable_composition",  "Window Compositing Disable",         disable_composition, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_CMD(RARCH_CMD_REINIT) WITH_FLAGS(SD_FLAG_CMD_APPLY_AUTO)
       CONFIG_BOOL(g_settings.pause_nonactive,            "pause_nonactive",            "Window Unfocus Pause",       pause_nonactive, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)