diff --git a/src/components/VideoElement.js b/src/components/VideoElement.js
index 5837f0e2..f5b380a4 100644
--- a/src/components/VideoElement.js
+++ b/src/components/VideoElement.js
@@ -6,8 +6,7 @@ import './VideoElement.css'
 
 // streamUrl: string
 // loading: boolean
-export function VideoElement({ streamUrl, loading, setProgress }) {
-    const videoRef = React.useRef(null);
+export function VideoElement({ streamUrl, loading, setProgress, videoRef }) {
     const [error, setError] = React.useState(false);
 
     React.useEffect(() => {
@@ -30,14 +29,6 @@ export function VideoElement({ streamUrl, loading, setProgress }) {
         }
     }, [videoRef, streamUrl, loading]);
 
-    React.useEffect(() => {
-        console.log('running')
-        const element = document.getElementsByClassName('videoElement')[0];
-        if (!element) return;        
-
-        element.onProgress = setProgress;
-    })
-
     if (error)
         return (<VideoPlaceholder>Your browser is not supported</VideoPlaceholder>)
 
diff --git a/src/views/Movie.js b/src/views/Movie.js
index 348e53d5..43a5a282 100644
--- a/src/views/Movie.js
+++ b/src/views/Movie.js
@@ -20,6 +20,7 @@ export function MovieView(props) {
     const [ episodeLists, setEpisodeList ] = React.useState([]);
     const [ loading, setLoading ] = React.useState(false);
     const [ selectedSeason, setSelectedSeason ] = React.useState("1");
+    const videoRef = React.useRef(null);
     let isVideoTimeSet = React.useRef(false)
 
     const season = showRouteMatch?.params.season || "1";
@@ -34,10 +35,10 @@ export function MovieView(props) {
         if (streamData.type === "show" && !showRouteMatch) history.replace(`${baseRouteMatch.url}/season/1/episode/1`);
     }, [streamData.type, showRouteMatch, history, baseRouteMatch.url]);
 
-    // React.useEffect(() => {
-    //     if (streamData.type === "show" && showRouteMatch) setSelectedSeason(showRouteMatch.params.season.toString());
-    //     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // }, []);
+    React.useEffect(() => {
+        if (streamData.type === "show" && showRouteMatch) setSelectedSeason(showRouteMatch.params.season.toString());
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     React.useEffect(() => {
         let cancel = false;
@@ -84,23 +85,20 @@ export function MovieView(props) {
             let time = ls?.[streamData.source]?.[streamData.type]?.[streamData.slug]?.[key]?.currentlyAt;
 
             if (time) {
-                const element = document.getElementsByClassName('videoElement')[0];
-
-                if (!element) {
-                    return () => { isVideoTimeSet.current = false }
+                if (!videoRef.current) {
+                    isVideoTimeSet.current = false;
+                    return;
                 }
 
-                element.currentTime = time;
+                videoRef.current.currentTime = time;
             }
         }
 
-        return () => {
-            isVideoTimeSet.current = true;
-        }
+        isVideoTimeSet.current = true;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     })
 
     const setProgress = (evt) => {
-        console.log('setting progress')
         let ls = JSON.parse(localStorage.getItem("video-progress") || "{}")
 
         if (!ls[streamData.source])
@@ -143,7 +141,7 @@ export function MovieView(props) {
                     Season {season}: Episode {episode}
                 </Title> : undefined}
 
-                <VideoElement streamUrl={streamUrl} loading={loading} setProgress={setProgress} />
+                <VideoElement streamUrl={streamUrl} loading={loading} setProgress={setProgress} videoRef={videoRef} />
 
                 {streamData.type === "show" ? 
                     <EpisodeSelector
diff --git a/src/views/Search.js b/src/views/Search.js
index 3aefe420..2dd2c8e1 100644
--- a/src/views/Search.js
+++ b/src/views/Search.js
@@ -162,7 +162,7 @@ export function SearchView() {
                         if (!subselection.show) continue;
 
                         let newShow = {};
-                        
+
                         // if the current season has a next episode, load it
                         if (subselection.meta.episodes[subselection.show.season].includes(`${parseInt(subselection.show.episode) + 1}`)) {
                             newShow.season = subselection.show.season;
@@ -194,8 +194,6 @@ export function SearchView() {
                 return b.data.updatedAt - a.data.updatedAt
             });
 
-            console.log(newContinueWatching);
-
             setContinueWatching(newContinueWatching)
         })
     }, []);