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 d27096a2f..5bb95c200 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,6 +910,12 @@ 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