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 ce97b3984723c406bd8d1bac78de0f04dd0fe461..22ac3c2d6c4de4e1333164e62872f258cbc459e0 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
@@ -140,7 +140,7 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
   }
 
   private fun ensureFragment(resolvedShareData: ResolvedShareData) {
-    if (supportFragmentManager.fragments.none { it is MultiselectForwardFullScreenDialogFragment }) {
+    if (!supportFragmentManager.isStateSaved && supportFragmentManager.fragments.none { it is MultiselectForwardFullScreenDialogFragment }) {
       supportFragmentManager.beginTransaction()
         .replace(
           R.id.fragment_container,