diff --git a/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt
index 00bd5288..7a8a6ac4 100644
--- a/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt
+++ b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt
@@ -586,7 +586,6 @@ class MpvPlayerCore(private val activity: Activity) :
             } catch (e: Exception) {
                 Log.w(TAG, "Failed to remove MPV observers during dispose", e)
             }
-            detachSurfaceInternal()
         }
 
         overlayLayoutListener?.let { listener ->
@@ -621,6 +620,7 @@ class MpvPlayerCore(private val activity: Activity) :
             Thread {
                 synchronized(mpvLock) {
                     try {
+                        detachSurfaceInternal()
                         MPVLib.destroy()
                     } catch (e: Exception) {
                         Log.w(TAG, "MPV destroy failed", e)