diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
index a0cb8813aa..5b8ce62d56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -307,6 +307,7 @@ class MediaSendViewModel extends ViewModel {
                                     .toList();
 
     selectedMedia.setValue(uncaptioned);
+    position.setValue(position.getValue() != null ? position.getValue() : 0);
     hudState.setValue(buildHudState());
   }