diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index c4a971ccf..e2c71673b 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1994,6 +1994,8 @@ class ChatController(args: Bundle) :
                         Log.d(TAG, "joinRoomWithPassword - joinRoom - got response: $startNanoTime")
 
                         val conversation = roomOverall.ocs!!.data!!
+                        currentConversation = conversation
+
                         sessionIdAfterRoomJoined = conversation.sessionId
                         ApplicationWideCurrentRoomHolder.getInstance().session = conversation.sessionId
                         ApplicationWideCurrentRoomHolder.getInstance().currentRoomId = conversation.roomId