diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 7c341737..55c7df86 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -139,6 +139,11 @@ export default {
 				// Set id of the condensed container to last message id,
 				// which is required for the unread marker to work correctly
 				lastCondensedContainer.id = message.id;
+
+				// If this message is the unread boundary, create a split condensed container
+				if (message.id === this.channel.firstUnread) {
+					lastCondensedContainer = null;
+				}
 			}
 
 			return condensed;