diff --git a/src/video/components/actions/LoadingAction.tsx b/src/video/components/actions/LoadingAction.tsx
index ce46356d..f79f5370 100644
--- a/src/video/components/actions/LoadingAction.tsx
+++ b/src/video/components/actions/LoadingAction.tsx
@@ -3,6 +3,7 @@ import { useVideoPlayerDescriptor } from "@/video/state/hooks";
 import { useMediaPlaying } from "@/video/state/logic/mediaplaying";
 import { useMisc } from "@/video/state/logic/misc";
 
+// TODO pausing before first frame will infinitely show spinner until unpaused
 export function LoadingAction() {
   const descriptor = useVideoPlayerDescriptor();
   const mediaPlaying = useMediaPlaying(descriptor);
diff --git a/src/views/media/MediaView.tsx b/src/views/media/MediaView.tsx
index dfd417b5..6e7d19b5 100644
--- a/src/views/media/MediaView.tsx
+++ b/src/views/media/MediaView.tsx
@@ -251,6 +251,7 @@ export function MediaView() {
       stream={stream}
       selected={selected}
       onChangeStream={(sId, eId) => {
+        // TODO changing episode breaks useGoBack
         history.replace(
           `/media/${encodeURIComponent(params.media)}/${encodeURIComponent(
             sId