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]);