diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
index 59e86a2cc7..972dcecb26 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -104,11 +104,7 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
     initToolbar(view.findViewById(R.id.mediapicker_toolbar));
     onScreenWidthChanged(getScreenWidth());
 
-    if (!Util.isEmpty(viewModel.getSelectedMedia().getValue())) {
-      adapter.setSelected(viewModel.getSelectedMedia().getValue());
-      onMediaSelectionChanged(new ArrayList<>(viewModel.getSelectedMedia().getValue()));
-    }
-
+    viewModel.getSelectedMedia().observe(this, adapter::setSelected);
     viewModel.getMediaInBucket(requireContext(), bucketId).observe(this, adapter::setMedia);
   }