diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index f32dfed2fd..9cbd0fee49 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -729,7 +729,7 @@ static void audio_monitor_adjust_system_rates(void)
          audio_driver_data.audio_rate.input);
 }
 
-static void audio_driver_setup_rewind(void)
+void audio_driver_setup_rewind(void)
 {
    unsigned i;
 
@@ -863,9 +863,6 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
          if (!uninit_audio())
             return false;
          break;
-      case RARCH_AUDIO_CTL_SETUP_REWIND:
-         audio_driver_setup_rewind();
-         break;
       case RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE:
          if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
             return false; 
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index dc6979a055..37916e4f19 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -46,7 +46,6 @@ enum rarch_audio_ctl_state
    RARCH_AUDIO_CTL_START,
    RARCH_AUDIO_CTL_STOP,
    RARCH_AUDIO_CTL_FIND_DRIVER,
-   RARCH_AUDIO_CTL_SETUP_REWIND,
    /* Sets audio monitor refresh rate to new value. */
    RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
    RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
@@ -178,6 +177,8 @@ void audio_driver_set_buffer_size(size_t bufsize);
 
 bool audio_driver_get_devices_list(void **ptr);
 
+void audio_driver_setup_rewind(void);
+
 bool audio_driver_init(void);
 
 extern audio_driver_t audio_rsound;
diff --git a/rewind.c b/rewind.c
index 1621e12d62..9ee215ba67 100644
--- a/rewind.c
+++ b/rewind.c
@@ -722,7 +722,8 @@ void state_manager_check_rewind(bool pressed)
          retro_ctx_serialize_info_t serial_info;
 
          state_manager_set_frame_is_reversed(true);
-         audio_driver_ctl(RARCH_AUDIO_CTL_SETUP_REWIND, NULL);
+
+         audio_driver_setup_rewind();
 
          runloop_msg_queue_push(
                msg_hash_to_str(MSG_REWINDING), 0,