diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
index aca9e90e8e..f87528a123 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
@@ -156,7 +156,7 @@ class MultiPlayerPlaybackManager(
                     newPosition: PositionInfo,
                     reason: Int,
                 ) {
-                    if (mustCachePositions) {
+                    if (mustCachePositions && player.playbackState != STATE_IDLE) {
                         cachedPositions.add(uri, newPosition.positionMs)
                     }
                 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
index 3dd23ce83e..2168470284 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
@@ -508,14 +508,20 @@ fun GetVideoController(
         }
 
         onDispose {
-            GlobalScope.launch(Dispatchers.Main) {
-                if (!keepPlaying.value) {
-                    // Stops and releases the media.
-                    controller.value?.let {
+            if (!keepPlaying.value) {
+                // Makes sure the variable is cleared before the task is launched
+                // to avoid the ON_RELEASE running before ON_PAUSE's coroutine
+                val toRelease = controller.value
+                controller.value = null
+
+                toRelease?.let {
+                    it.pause()
+
+                    GlobalScope.launch(Dispatchers.Main) {
+                        // Stops and releases the media.
                         it.stop()
                         it.release()
                         Log.d("PlaybackService", "Releasing Video $videoUri ")
-                        controller.value = null
                     }
                 }
             }