diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
index abbdfcafd2..4794fc8d64 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
@@ -1401,6 +1401,11 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 var entries: [ChatListSearchEntry] = []
                 var index = 0
                 
+                var recentPeers = recentPeers
+                if query != nil {
+                    recentPeers = []
+                }
+                
                 let _ = currentRemotePeers.swap((foundRemotePeers.0, foundRemotePeers.1))
                 
                 let filteredPeer: (EnginePeer, EnginePeer) -> Bool = { peer, accountPeer in
diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
index e53bec9b25..9d4aa9a9d0 100644
--- a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
+++ b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
@@ -1137,7 +1137,7 @@
     if ([self.item.asset isKindOfClass:[TGMediaAsset class]]) {
         itemSignal = [TGMediaAssetImageSignals playerItemForVideoAsset:(TGMediaAsset *)self.item.asset];
     }
-    else if (self.item.avAsset != nil) {
+    else if ([self.item respondsToSelector:@selector(avAsset)] && self.item.avAsset != nil) {
         itemSignal = [self.item.avAsset mapToSignal:^SSignal *(AVAsset *avAsset) {
             if ([avAsset isKindOfClass:[AVAsset class]]) {
                 return [SSignal single:[AVPlayerItem playerItemWithAsset:avAsset]];