diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index b97b1daec..bf504eac7 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4940,6 +4940,8 @@ typedef enum : NSUInteger {
             // clustering
             if (previousViewItem == nil) {
                 isFirstInCluster = YES;
+            } else if (viewItem.shouldShowDate) {
+                isFirstInCluster = YES;
             } else if (previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
                 isFirstInCluster = YES;
             } else {