diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 34312e415c..da842d9218 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -270,15 +270,9 @@ function Feed() {
   )
 
   const updateVideoState = useCallback(
-    (index?: number) => {
+    (index: number) => {
       if (!videos.length) return
 
-      if (index === undefined) {
-        index = currentIndex
-      } else {
-        setCurrentIndex(index)
-      }
-
       const prevSlice = videos.at(index - 1)
       const prevPost = prevSlice?.post
       const prevEmbed = prevPost?.embed
@@ -379,11 +373,11 @@ function Feed() {
         setCurrentSources(updatedSources)
       }
     },
-    [videos, currentSources, currentIndex, players],
+    [videos, currentSources, players],
   )
 
   const updateVideoStateInitially = useNonReactiveCallback(() => {
-    updateVideoState()
+    updateVideoState(currentIndex)
   })
 
   useFocusEffect(
@@ -405,7 +399,9 @@ function Feed() {
   const onViewableItemsChanged = useCallback(
     ({viewableItems}: {viewableItems: ViewToken[]; changed: ViewToken[]}) => {
       if (viewableItems[0] && viewableItems[0].index !== null) {
-        updateVideoState(viewableItems[0].index)
+        const newIndex = viewableItems[0].index
+        setCurrentIndex(newIndex)
+        updateVideoState(newIndex)
       }
     },
     [updateVideoState],