diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 1ff2b1e38..2ff0d64e4 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -323,8 +323,7 @@ const Player = ({ urlParams, queryParams }) => {
         setError(null);
         video.unload();
 
-        // if (player.stream?.type === 'Ready' && streamingServer.settings?.type !== 'Loading') {
-        if (player.selected && player.stream?.type === 'Ready' && streamingServer.settings?.type !== 'Loading') {
+        if (player.stream?.type === 'Ready' && streamingServer.settings?.type !== 'Loading') {
             video.load({
                 stream: {
                     ...player.stream.content,
diff --git a/src/routes/Player/useStatistics.js b/src/routes/Player/useStatistics.js
index d13411327..d8b241a8c 100644
--- a/src/routes/Player/useStatistics.js
+++ b/src/routes/Player/useStatistics.js
@@ -7,11 +7,12 @@ const useStatistics = (player, streamingServer) => {
     const { core } = useServices();
 
     const stream = React.useMemo(() => {
-        return player.selected?.stream ?
-            player.selected.stream
-            :
-            null;
-    }, [player.selected]);
+        if (player.stream?.type === 'Ready') {
+            return player.stream.content;
+        } else {
+            return null;
+        }
+    }, [player.stream]);
 
     const infoHash = React.useMemo(() => {
         return stream?.infoHash ?