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 66c337aaa..b9fb8c08a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1822,6 +1822,12 @@ class ChatController(args: Bundle) :
             activity?.findViewById<View>(R.id.toolbar)?.setOnClickListener(null)
         }
 
+        checkingLobbyStatus = false
+
+        if (lobbyTimerHandler != null) {
+            lobbyTimerHandler?.removeCallbacksAndMessages(null)
+        }
+
         if (conversationUser != null && isActivityNotChangingConfigurations() && isNotInCall()) {
             ApplicationWideCurrentRoomHolder.getInstance().clear()
             if (inConversation && validSessionId()) {
@@ -1956,6 +1962,7 @@ class ChatController(args: Bundle) :
                     currentConversation?.sessionId
                 )
             }
+            checkLobbyState()
             if (isFirstMessagesProcessing) {
                 pullChatMessages(0)
             } else {