diff --git a/src/components/player/Player.jsx b/src/components/player/Player.jsx
index fd3157e..fb19d63 100644
--- a/src/components/player/Player.jsx
+++ b/src/components/player/Player.jsx
@@ -640,7 +640,7 @@ export default function Player({
       }
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [streamUrl, subtitles, intro, outro]);
+  }, [streamUrl, subtitles, intro, outro, activeServerName]);
 
   return <div ref={artRef} className="w-full h-full" />;
 }
\ No newline at end of file
diff --git a/src/hooks/useWatch.js b/src/hooks/useWatch.js
index e2c65db..19f6729 100644
--- a/src/hooks/useWatch.js
+++ b/src/hooks/useWatch.js
@@ -136,27 +136,7 @@ export const useWatch = (animeId, initialEpisodeId) => {
 
         let serversList = [...filteredServers];
 
-        if (serversList.some((s) => s.type === "sub")) {
-          if (!serversList.some((s) => s.serverName === "HD-4" && s.type === "sub")) {
-            serversList.push({
-              type: "sub",
-              data_id: "69696968",
-              server_id: "41",
-              serverName: "HD-4",
-            });
-          }
-        }
 
-        if (serversList.some((s) => s.type === "dub")) {
-          if (!serversList.some((s) => s.serverName === "HD-4" && s.type === "dub")) {
-            serversList.push({
-              type: "dub",
-              data_id: "96969696",
-              server_id: "42",
-              serverName: "HD-4",
-            });
-          }
-        }
 
         const savedServerName = localStorage.getItem("server_name");
         const savedServerType = localStorage.getItem("server_type");
@@ -199,6 +179,15 @@ export const useWatch = (animeId, initialEpisodeId) => {
     };
   }, [episodeId, episodes]);
 
+  useEffect(() => {
+    if (!servers || !activeServerId) return;
+    const activeServer = servers.find((s) => s.data_id === activeServerId);
+    if (activeServer) {
+      setActiveServerName(activeServer.serverName);
+      setActiveServerType(activeServer.type);
+    }
+  }, [activeServerId, servers]);
+
   // Fetch stream info only when episodeId, activeServerId, and servers are ready
   useEffect(() => {
     if (