diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 3f14ec7d7..9e406517a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -19270,11 +19270,6 @@ std::pair<int32, vector<FullMessageId>> MessagesManager::search_messages(
     return {};
   }
 
-  if (query.empty()) {
-    promise.set_value(Unit());
-    return {};
-  }
-
   auto filter_type = get_search_messages_filter(filter);
   if (filter_type == SearchMessagesFilter::Call || filter_type == SearchMessagesFilter::MissedCall ||
       filter_type == SearchMessagesFilter::Mention || filter_type == SearchMessagesFilter::UnreadMention ||
@@ -19283,6 +19278,11 @@ std::pair<int32, vector<FullMessageId>> MessagesManager::search_messages(
     return {};
   }
 
+  if (query.empty() && filter_type == SearchMessagesFilter::Empty) {
+    promise.set_value(Unit());
+    return {};
+  }
+
   do {
     random_id = Random::secure_int64();
   } while (random_id == 0 || found_messages_.find(random_id) != found_messages_.end());