diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
index b6d264be96..5d3ada2c3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
@@ -283,9 +283,13 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
           .asBorderless(multiShareArgs.isBorderless)
           .withShareDataTimestamp(System.currentTimeMillis())
 
-        val mainActivityIntent = MainActivity.clearTop(this)
+        val conversationIntent = conversationIntentBuilder.build()
+        val mainActivityIntent = MainActivity.clearTop(this).apply {
+          action = ConversationIntents.ACTION
+          putExtras(conversationIntent)
+        }
         finish()
-        startActivities(arrayOf(mainActivityIntent, conversationIntentBuilder.build()))
+        startActivity(mainActivityIntent)
       }
   }