diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 2b85777a12..4fa0dd9931 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -4700,7 +4700,7 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
     }
     
     override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        guard let item = self.item else {
+        guard let item = self.item, self.frame.height > 0.0 else {
             return nil
         }
         
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNoticeItem.swift b/submodules/ChatListUI/Sources/Node/ChatListNoticeItem.swift
index d1075fb80f..b3f88f9b8c 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNoticeItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNoticeItem.swift
@@ -312,6 +312,7 @@ final class ChatListNoticeItemNode: ItemListRevealOptionsItemNode {
                             avatarsNode = current
                         } else {
                             avatarsNode = MergedAvatarsNode()
+                            avatarsNode.isUserInteractionEnabled = false
                             strongSelf.addSubnode(avatarsNode)
                             strongSelf.avatarsNode = avatarsNode
                         }