diff --git a/cockatrice/src/client/network/replay_timeline_widget.cpp b/cockatrice/src/client/network/replay_timeline_widget.cpp
index deb77d623..c5197c2a6 100644
--- a/cockatrice/src/client/network/replay_timeline_widget.cpp
+++ b/cockatrice/src/client/network/replay_timeline_widget.cpp
@@ -106,20 +106,13 @@ void ReplayTimelineWidget::handleBackwardsSkip(bool doRewindBuffering)
         // The rewind only happens once the timer runs out.
         // If another backwards skip happens, the timer will just get reset instead of rewinding.
         rewindBufferingTimer->stop();
-        rewindBufferingTimer->start(calcRewindBufferingTimeout());
+        rewindBufferingTimer->start(SettingsCache::instance().getRewindBufferingMs());
     } else {
         // otherwise, process the rewind immediately
         processRewind();
     }
 }
 
-/// The timeout scales based on the current event number, up to a limit
-int ReplayTimelineWidget::calcRewindBufferingTimeout() const
-{
-    int extraTime = currentEvent / 100;
-    return std::min(BASE_REWIND_BUFFERING_TIMEOUT_MS + extraTime, MAX_REWIND_BUFFERING_TIMEOUT_MS);
-}
-
 void ReplayTimelineWidget::processRewind()
 {
     // stop any queued-up rewinds
diff --git a/cockatrice/src/client/network/replay_timeline_widget.h b/cockatrice/src/client/network/replay_timeline_widget.h
index b4a0559a4..68f70fa65 100644
--- a/cockatrice/src/client/network/replay_timeline_widget.h
+++ b/cockatrice/src/client/network/replay_timeline_widget.h
@@ -28,8 +28,6 @@ private:
 
     static constexpr int TIMER_INTERVAL_MS = 200;
     static constexpr int BIN_LENGTH = 5000;
-    static constexpr int BASE_REWIND_BUFFERING_TIMEOUT_MS = 180;
-    static constexpr int MAX_REWIND_BUFFERING_TIMEOUT_MS = 280;
 
     QTimer *replayTimer;
     QTimer *rewindBufferingTimer;
@@ -42,7 +40,6 @@ private:
 
     void skipToTime(int newTime, bool doRewindBuffering);
     void handleBackwardsSkip(bool doRewindBuffering);
-    int calcRewindBufferingTimeout() const;
     void processRewind();
     void processNewEvents(PlaybackMode playbackMode);
 private slots: