diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
index 1be2170d51..d99352be12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
@@ -198,10 +198,18 @@ class MediaSelectionViewModel(
                     video.uri to VideoTrimData(true, duration, 0, maxDuration)
                   }
                 }
+
+              val updatedCameraFirstCapture = if (it.cameraFirstCapture != null) {
+                filterResult.filteredMedia.find { filtered -> filtered.uri == it.cameraFirstCapture.uri }
+              } else {
+                null
+              }
+
               it.copy(
                 selectedMedia = filterResult.filteredMedia,
                 focusedMedia = it.focusedMedia ?: filterResult.filteredMedia.first(),
-                editorStateMap = it.editorStateMap + initializedVideoEditorStates
+                editorStateMap = it.editorStateMap + initializedVideoEditorStates,
+                cameraFirstCapture = updatedCameraFirstCapture ?: it.cameraFirstCapture
               )
             }