diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionDestination.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionDestination.kt
index 41675d8e8c..c1c5da9878 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionDestination.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionDestination.kt
@@ -46,6 +46,14 @@ sealed class MediaSelectionDestination {
       }
     }
 
+    override fun getRecipientSearchKey(): ContactSearchKey.RecipientSearchKey? {
+      return if (recipientSearchKeys.size == 1) {
+        recipientSearchKeys[0]
+      } else {
+        super.getRecipientSearchKey()
+      }
+    }
+
     override fun getRecipientSearchKeyList(): List<ContactSearchKey.RecipientSearchKey> = recipientSearchKeys
 
     override fun toBundle(): Bundle {