diff --git a/NextcloudTalk/NCChatViewController.m b/NextcloudTalk/NCChatViewController.m
index 39de647e..7deb37ff 100644
--- a/NextcloudTalk/NCChatViewController.m
+++ b/NextcloudTalk/NCChatViewController.m
@@ -2393,6 +2393,13 @@ NSString * const NCChatViewControllerTalkToUserNotification = @"NCChatViewContro
         if (notification.object != self->_chatController) {
             return;
         }
+
+        if ([self shouldPresentLobbyView]) {
+            self->_hasRequestedInitialHistory = NO;
+            [self startObservingRoomLobbyFlag];
+            
+            return;
+        }
         
         NSMutableArray *messages = [notification.userInfo objectForKey:@"messages"];
         if (messages.count > 0) {
@@ -2443,7 +2450,6 @@ NSString * const NCChatViewControllerTalkToUserNotification = @"NCChatViewContro
             }
             
             [self.tableView reloadData];
-            [self checkLobbyState];
             
             if (indexPathUnreadMessageSeparator) {
                 [self.tableView scrollToRowAtIndexPath:indexPathUnreadMessageSeparator atScrollPosition:UITableViewScrollPositionMiddle animated:NO];