diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
index 949f4c381c..6ce582cad4 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
@@ -106,11 +106,11 @@ class MainActivity: FragmentActivity() {
     }
     if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
       val sharedContent = chatModel.sharedContent.value
+      // Drop shared content
+      chatModel.sharedContent.value = null
       if (sharedContent is SharedContent.Forward) {
         chatModel.chatId.value = sharedContent.fromChatInfo.id
       }
-      // Drop shared content
-      chatModel.sharedContent.value = null
       if (canFinishActivity) {
         finish()
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
index 89fc9c3a2e..a36930f5ce 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
@@ -83,11 +83,11 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
       }
       else -> NavigationButtonBack(onButtonClicked = {
         val sharedContent = chatModel.sharedContent.value
+        // Drop shared content
+        chatModel.sharedContent.value = null
         if (sharedContent is SharedContent.Forward) {
           chatModel.chatId.value = sharedContent.fromChatInfo.id
         }
-        // Drop shared content
-        chatModel.sharedContent.value = null
       })
     }
   }