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