diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/Media3PlaybackService.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/Media3PlaybackService.java
index 0ad31755a..6e8057392 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/Media3PlaybackService.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/Media3PlaybackService.java
@@ -164,7 +164,15 @@ public class Media3PlaybackService extends MediaLibraryService {
 
             @Override
             public void seekForward() {
-                seekTo(Math.min(getDuration(), getCurrentPosition() + UserPreferences.getFastForwardSecs() * 1000L));
+                long duration = getDuration();
+                long target = getCurrentPosition() + UserPreferences.getFastForwardSecs() * 1000L;
+
+                if (duration > 0 && target >= duration) {
+                    handlePlaybackEnded();
+                    return;
+                }
+
+                seekTo(target);
             }
 
             @Override