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 0da522323..bc7875d7f 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
@@ -883,13 +883,17 @@ fun ControlWhenPlayerIsActive(
                 override fun onIsPlayingChanged(isPlaying: Boolean) {
                     // doesn't consider the mutex because the screen can turn off if the video
                     // being played in the mutex is not visible.
-                    view.keepScreenOn = isPlaying
+                    if (view.keepScreenOn != isPlaying) {
+                        view.keepScreenOn = isPlaying
+                    }
                 }
             }
 
         controller.addListener(listener)
         onDispose {
-            view.keepScreenOn = false
+            if (view.keepScreenOn) {
+                view.keepScreenOn = false
+            }
             controller.removeListener(listener)
         }
     }