diff --git a/src/components/EpisodeSelector.js b/src/components/EpisodeSelector.js
index f0fb16fe..a478873d 100644
--- a/src/components/EpisodeSelector.js
+++ b/src/components/EpisodeSelector.js
@@ -28,7 +28,7 @@ export function EpisodeSelector({ setSelectedSeason, selectedSeason, setEpisode,
 
     return (
         <div className="episodeSelector">
-            <TypeSelector setType={setSelectedSeason} choices={seasons.map(v=>({ value: v.toString(), label: `Season ${v}`}))} selected={selectedSeason}/><br></br>
+            <TypeSelector setType={setSelectedSeason} selected={selectedSeason} choices={seasons.map(v=>({ value: v.toString(), label: `Season ${v}`}))} /><br></br>
             <NumberSelector setType={(e) => setEpisode({episode: e, season: selectedSeason})} choices={choices} selected={(selectedSeason.toString() === currentSeason) ? currentEpisode : null} />
         </div>
     )
diff --git a/src/views/Movie.js b/src/views/Movie.js
index 936ed8ad..e7aadafc 100644
--- a/src/views/Movie.js
+++ b/src/views/Movie.js
@@ -35,7 +35,8 @@ export function MovieView(props) {
 
     React.useEffect(() => {
         if (streamData.type === "show" && showRouteMatch) setSelectedSeason(showRouteMatch.params.season.toString());
-    }, [showRouteMatch, streamData]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     React.useEffect(() => {
         let cancel = false;
@@ -83,7 +84,6 @@ export function MovieView(props) {
     React.useEffect(() => {
         if (streamData.type === "show") {
             setSeasonList(streamData.seasons);
-            setSelectedSeason(selectedSeason)
             setEpisodeList(streamData.episodes[selectedSeason]);
         }
     }, [streamData, selectedSeason])