From 094a23537392a214f9b56d33ea3aee0981ef9696 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 24 Jun 2021 14:46:09 +0300
Subject: [PATCH] Message List: Prevent exception after failed sync

---
 src/components/middle/MessageList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx
index e46ef78fb..3554ed152 100644
--- a/src/components/middle/MessageList.tsx
+++ b/src/components/middle/MessageList.tsx
@@ -263,7 +263,7 @@ const MessageList: FC<OwnProps & StateProps & DispatchProps> = ({
       return undefined;
     }
 
-    const listedMessages = viewportIds.map((id) => messagesById[id]);
+    const listedMessages = viewportIds.map((id) => messagesById[id]).filter(Boolean);
     return groupMessages(orderBy(listedMessages, ['date', 'id']), memoUnreadDividerBeforeIdRef.current);
   }, [messageIds, messagesById, threadFirstMessageId, threadTopMessageId]);