diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index 5bb95c200..d27096a2f 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -910,12 +910,6 @@ open class ConversationFragment : SlidingPaneChildFragment() {
     override fun onResume() {
         super.onResume()
 
-        if (!viewModel.isChatRoomInitialized()) {
-            Log.w("$TAG Fragment resuming but no chatRoom in viewModel, going back")
-            goBack()
-            return
-        }
-
         viewModel.updateCurrentlyDisplayedConversation()
 
         // Wait for items to be displayed
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
index bdbce077a..b018865f1 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
@@ -450,11 +450,15 @@ class ConversationViewModel @UiThread constructor() : AbstractConversationViewMo
     @UiThread
     fun updateCurrentlyDisplayedConversation() {
         coreContext.postOnCoreThread {
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
-            Log.i("$TAG Asking notifications manager not to notify messages for conversation [$id]")
-            coreContext.notificationsManager.setCurrentlyDisplayedChatRoomId(id)
+            if (isChatRoomInitialized()) {
+                val id = LinphoneUtils.getChatRoomId(chatRoom)
+                Log.i(
+                    "$TAG Asking notifications manager not to notify messages for conversation [$id]"
+                )
+                coreContext.notificationsManager.setCurrentlyDisplayedChatRoomId(id)
 
-            checkIfConversationShouldBeDisabledForSecurityReasons()
+                checkIfConversationShouldBeDisabledForSecurityReasons()
+            }
         }
     }