diff --git a/app/player/page.tsx b/app/player/page.tsx
index 3133703..25973d7 100644
--- a/app/player/page.tsx
+++ b/app/player/page.tsx
@@ -217,8 +217,7 @@ function PlayerContent() {
                       }
                       setCurrentSourceId(newSource.source);
                       router.replace(`/player?${params.toString()}`, { scroll: false });
-                      // Trigger refetch
-                      window.location.reload();
+                      // Data will be refetched automatically via useEffect in useVideoPlayer hook
                     }}
                   />
                 )}
diff --git a/components/player/VideoPlayer.tsx b/components/player/VideoPlayer.tsx
index 570d85c..2d3aad0 100644
--- a/components/player/VideoPlayer.tsx
+++ b/components/player/VideoPlayer.tsx
@@ -195,7 +195,7 @@ export function VideoPlayer({
         />
       ) : (
         <CustomVideoPlayer
-          key={`${useProxy ? 'proxy' : 'direct'}-${retryCount}`} // Only remount when switching modes or retrying, NOT when changing episodes
+          key={`${useProxy ? 'proxy' : 'direct'}-${retryCount}-${source}`} // Remount when switching sources, modes, or retrying
           src={finalPlayUrl}
           onError={handleVideoError}
           onTimeUpdate={handleTimeUpdate}
diff --git a/lib/hooks/useVideoPlayer.ts b/lib/hooks/useVideoPlayer.ts
index 648ac83..5571ee0 100644
--- a/lib/hooks/useVideoPlayer.ts
+++ b/lib/hooks/useVideoPlayer.ts
@@ -169,6 +169,10 @@ export function useVideoPlayer(
 
   useEffect(() => {
     if (videoId && source) {
+      // Reset state when source changes to ensure clean fetch
+      setVideoData(null);
+      setCurrentEpisode(0);
+      setPlayUrl('');
       fetchVideoDetails();
     }
   }, [videoId, source, fetchVideoDetails]);