diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 4a74f326d..3e8006259 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -780,7 +780,9 @@ FilterId ChatFilters::lookupId(int index) const {
 		return FilterId(); // AyuGram: fix crash when using `hideAllChatsFolder`
 	}
 
-	if (_owner->session().user()->isPremium() || !_list.front().id()) {
+	const auto settings = &AyuSettings::getInstance();
+
+	if (_owner->session().user()->isPremium() || !_list.front().id() || settings->hideAllChatsFolder) {
 		return _list[index].id();
 	}
 	const auto i = ranges::find(_list, FilterId(0), &ChatFilter::id);
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index d1826fe84..17e1b5aa4 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -260,7 +260,7 @@ void FiltersMenu::refresh() {
 	// and there will be an exception in `Window::SessionController::showPeerHistory`
 	// because `SessionController::content()` == nullptr
     if (settings->hideAllChatsFolder && _session->widget()->sessionContent()) {
-        const auto lookupId = filters->lookupId(premium() ? 0 : 1);
+        const auto lookupId = filters->lookupId(0);
         _session->setActiveChatsFilter(lookupId);
     }
 }