diff --git a/android/native/jni/main.c b/android/native/jni/main.c
index 2bb7ca5ccd..3488ee5c10 100644
--- a/android/native/jni/main.c
+++ b/android/native/jni/main.c
@@ -207,6 +207,9 @@ void engine_handle_cmd(struct android_app* android_app, int32_t cmd)
          if(g_extern.lifecycle_state & (1ULL << RARCH_REENTRANT))
          {
             uninit_drivers();
+            driver.video_data = NULL;
+            driver.audio_data = NULL;
+            driver.input_data = NULL;
             g_android.window_ready = false;
          }
 
diff --git a/driver.c b/driver.c
index 5013268894..2e68dbbde1 100644
--- a/driver.c
+++ b/driver.c
@@ -238,10 +238,8 @@ static void adjust_system_rates(void)
 
    RARCH_LOG("Set audio input rate to: %.2f Hz.\n", g_settings.audio.in_rate);
 
-#ifndef ANDROID
    if (driver.video_data)
       video_set_nonblock_state_func(!g_settings.video.vsync || g_extern.system.force_nonblock);
-#endif
 }
 
 void driver_set_monitor_refresh_rate(float hz)