diff --git a/app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt b/app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt
index 8ac62bebc8..e2f36c8ec8 100644
--- a/app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt
@@ -156,9 +156,8 @@ class SocketHandler(
 			PlaystateCommand.SEEK -> playbackController?.seek(
 				(message.request.seekPositionTicks ?: 0) / TICKS_TO_MS
 			)
-			// FIXME get rewind/forward amount from displayprefs
-			PlaystateCommand.REWIND -> playbackController?.skip(REWIND_MS)
-			PlaystateCommand.FAST_FORWARD -> playbackController?.skip(FORWARD_MS)
+			PlaystateCommand.REWIND -> playbackController?.rewind()
+			PlaystateCommand.FAST_FORWARD -> playbackController?.fastForward()
 		}
 	}
 
@@ -196,7 +195,5 @@ class SocketHandler(
 
 	companion object {
 		const val TICKS_TO_MS = 10000L
-		const val REWIND_MS = -11000
-		const val FORWARD_MS = 30000
 	}
 }
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
index 68bf69d3d8..4a9ba43122 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
@@ -497,10 +497,10 @@ else if (mSelectedProgramView instanceof GuideChannelHeader)
                 mPlaybackController.playPause();
                 return true;
             } else if (keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD || keyCode == KeyEvent.KEYCODE_BUTTON_R1 || keyCode == KeyEvent.KEYCODE_BUTTON_R2) {
-                mPlaybackController.skip(30000);
+                mPlaybackController.fastForward();
                 return true;
             } else if (keyCode == KeyEvent.KEYCODE_MEDIA_REWIND || keyCode == KeyEvent.KEYCODE_BUTTON_L1 || keyCode == KeyEvent.KEYCODE_BUTTON_L2) {
-                mPlaybackController.skip(-11000);
+                mPlaybackController.rewind();
                 return true;
             }
         }
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
index b37282ae58..da224954d6 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
@@ -1283,7 +1283,7 @@ public void onError(Exception exception) {
         currentSkipPos = 0;
     };
 
-    public void skip(int msec) {
+    private void skip(int msec) {
         if (hasInitializedVideoManager() && (isPlaying() || isPaused()) && spinnerOff && mVideoManager.getCurrentPosition() > 0) { //guard against skipping before playback has truly begun
             mHandler.removeCallbacks(skipRunnable);
             refreshCurrentPosition();