diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
index 31824020f..caf86a82c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
@@ -37,7 +37,7 @@ class MediaSelectionGalleryFragment : Fragment(R.layout.fragment_container), Med
   )
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    val isFirst = arguments?.getBoolean("first") ?: false
+    val isFirst = arguments?.getBoolean("suppressEmptyError") ?: arguments?.getBoolean("first") ?: false
     sharedViewModel.setSuppressEmptyError(isFirst)
     mediaGalleryFragment = ensureMediaGalleryFragment()
 
diff --git a/app/src/main/res/navigation/media.xml b/app/src/main/res/navigation/media.xml
index 299244060..332b96523 100644
--- a/app/src/main/res/navigation/media.xml
+++ b/app/src/main/res/navigation/media.xml
@@ -12,7 +12,12 @@
         tools:layout="@layout/fragment_container">
         <action
             android:id="@+id/action_mediaCaptureFragment_to_mediaGalleryFragment"
-            app:destination="@id/mediaGalleryFragment" />
+            app:destination="@id/mediaGalleryFragment">
+            <argument
+                android:name="suppressEmptyError"
+                android:defaultValue="true"
+                app:argType="boolean" />
+        </action>
         <action
             android:id="@+id/action_mediaCaptureFragment_to_textStoryPostCreationFragment"
             app:destination="@id/textStoryPostCreationFragment"