diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 7a4d5b035..f1e0657d9 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -440,6 +440,9 @@ const Player = ({ urlParams, queryParams }) => {
         defaultSubtitlesSelected.current = false;
         defaultAudioTrackSelected.current = false;
         nextVideoPopupDismissed.current = false;
+        // we need a timeout here to make sure that previous page unloads and the new one loads
+        // avoiding race conditions and flickering
+        setTimeout(() => isNavigating.current = false, 1000);
     }, [video.state.stream]);
 
     React.useEffect(() => {