diff --git a/frontend/src/components/EmbeddableVideoPlayer.tsx b/frontend/src/components/EmbeddableVideoPlayer.tsx
index b4201038..69f4291d 100644
--- a/frontend/src/components/EmbeddableVideoPlayer.tsx
+++ b/frontend/src/components/EmbeddableVideoPlayer.tsx
@@ -37,12 +37,14 @@ const EmbeddableVideoPlayer = ({ videoId }: EmbeddableVideoPlayerProps) => {
 
   const { data: videoResponseData } = videoResponse ?? {};
 
-  useEffect(() => {
+  const [prevVideoId, setPrevVideoId] = useState(videoId);
+  if (videoId !== prevVideoId) {
+    setPrevVideoId(videoId);
     if (!videoId) {
       setVideoResponse(undefined);
       setPlaylists(undefined);
     }
-  }, [videoId]);
+  }
 
   useEffect(() => {
     (async () => {