diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 696c4d39e..a1f8b6b9e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -522,7 +522,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
         messageInputView.getButton().setContentDescription(getResources()
                 .getString(R.string.nc_description_send_message_button));
 
-        if (currentConversation != null) {
+        if (currentConversation.getRoomId() != null) {
             loadAvatarForStatusBar();
             checkLobbyState();
         }
@@ -599,12 +599,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
             messagesListView.setVisibility(View.VISIBLE);
             messageInput.setVisibility(View.VISIBLE);
         }
-
-        if (isFirstMessagesProcessing) {
-            pullChatMessages(0);
-        } else {
-            pullChatMessages(1);
-        }
     }
 
     private void showBrowserScreen(BrowserController.BrowserType browserType) {
@@ -817,6 +811,12 @@ public class ChatController extends BaseController implements MessagesListAdapte
                             setupWebsocket();
                             checkLobbyState();
 
+                            if (isFirstMessagesProcessing) {
+                                pullChatMessages(0);
+                            } else {
+                                pullChatMessages(1);
+                            }
+
                             if (magicWebSocketInstance != null) {
                                 magicWebSocketInstance.joinRoomWithRoomTokenAndSession(roomToken,
                                         currentCall.getSessionId());