diff --git a/src/modules/helpers/chats.ts b/src/modules/helpers/chats.ts
index e659c5b3e..0e7cda381 100644
--- a/src/modules/helpers/chats.ts
+++ b/src/modules/helpers/chats.ts
@@ -282,8 +282,9 @@ export function prepareFolderListIds(
   const pinnedChatIds = folder.excludedChatIds ? new Set(folder.pinnedChatIds) : undefined;
   const listIds = ([] as string[]).concat(allListIds.active || [], allListIds.archived || [])
     .filter((id) => {
-      return filterChatFolder(
-        chatsById[id],
+      const chat = chatsById[id];
+      return chat && filterChatFolder(
+        chat,
         folder,
         usersById,
         notifySettings,