diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 4310ccad7..d448de5a4 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -859,14 +859,8 @@ public final class Player implements
         final long windowPos = simpleExoPlayer.getCurrentPosition();
         final long duration = simpleExoPlayer.getDuration();
 
-        if (windowPos > 0
-                // Sometimes (e.g. when the playback ended) the windowPos is a few milliseconds
-                // higher than the duration. Due to this a little buffer (100ms) was introduced.
-                // See also https://github.com/TeamNewPipe/NewPipe/pull/7195#issuecomment-962624380
-                && windowPos <= duration + 100
-        ) {
-            setRecovery(queuePos, Math.min(windowPos, duration));
-        }
+        // No checks due to https://github.com/TeamNewPipe/NewPipe/pull/7195#issuecomment-962624380
+        setRecovery(queuePos, Math.max(0, Math.min(windowPos, duration)));
     }
 
     private void setRecovery(final int queuePos, final long windowPos) {