diff --git a/general.h b/general.h
index c873aa4e7a..cf2483f7e9 100644
--- a/general.h
+++ b/general.h
@@ -105,6 +105,7 @@ enum basic_event
    RARCH_CMD_REWIND_TOGGLE,
    RARCH_CMD_AUTOSAVE_DEINIT,
    RARCH_CMD_AUTOSAVE_INIT,
+   RARCH_CMD_AUTOSAVE_STATE,
    RARCH_CMD_AUDIO_STOP,
    RARCH_CMD_AUDIO_START,
    RARCH_CMD_OVERLAY_INIT,
diff --git a/retroarch.c b/retroarch.c
index 7b0f8e6de3..c90803bb14 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2255,6 +2255,9 @@ void rarch_main_command(unsigned cmd)
          init_autosave();
 #endif
          break;
+      case RARCH_CMD_AUTOSAVE_STATE:
+         save_auto_state();
+         break;
       case RARCH_CMD_AUDIO_STOP:
          if (!driver.audio_data)
             return;
@@ -2613,7 +2616,7 @@ void rarch_main_deinit(void)
    rarch_main_command(RARCH_CMD_CHEATS_DEINIT);
    rarch_main_command(RARCH_CMD_BSV_MOVIE_DEINIT);
 
-   save_auto_state();
+   rarch_main_command(RARCH_CMD_AUTOSAVE_STATE);
 
    deinit_core();