diff --git a/Telegram/NotificationService/Sources/NotificationService.swift b/Telegram/NotificationService/Sources/NotificationService.swift
index 67a323248d..d1529a3c8f 100644
--- a/Telegram/NotificationService/Sources/NotificationService.swift
+++ b/Telegram/NotificationService/Sources/NotificationService.swift
@@ -1434,7 +1434,10 @@ private final class NotificationServiceHandler {
                                                         switch state {
                                                         case let .idBased(maxIncomingReadId, _, _, _, _):
                                                             if maxIncomingReadId >= messageId.id {
+                                                                Logger.shared.log("NotificationService \(episode)", "maxIncomingReadId: \(maxIncomingReadId), messageId: \(messageId.id), skipping")
                                                                 content = NotificationContent(isLockedMessage: nil)
+                                                            } else {
+                                                                Logger.shared.log("NotificationService \(episode)", "maxIncomingReadId: \(maxIncomingReadId), messageId: \(messageId.id), not skipping")
                                                             }
                                                         case .indexBased:
                                                             break
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
index 10271ba496..045bc6ba5e 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -1371,7 +1371,7 @@ public final class ChatListNode: ListView {
         
         let suggestPasswordSetup: Signal<Bool, NoError>
         if case .chatList(groupId: .root) = location, chatListFilter == nil {
-            suggestPasswordSetup = combineLatest(
+            suggestPasswordSetup = .single(false) |> then(combineLatest(
                 getServerProvidedSuggestions(account: context.account),
                 context.engine.auth.twoStepVerificationConfiguration()
             )
@@ -1389,7 +1389,7 @@ public final class ChatListNode: ListView {
                     return false
                 }
                 return suggestions.contains(.setupPassword)
-            }
+            })
             |> distinctUntilChanged
         } else {
             suggestPasswordSetup = .single(false)