diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index 772943c27..a1b81eb9e 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -1835,6 +1835,11 @@ typedef enum : NSUInteger {
         id<OWSMessageData> previousMessage =
             [self messageAtIndexPath:[NSIndexPath indexPathForItem:indexPath.row - 1 inSection:indexPath.section]];
 
+        if ([previousMessage.interaction isKindOfClass:[TSUnreadIndicatorInteraction class]]) {
+            // Always show timestamp between unread indicator and the following interaction
+            return YES;
+        }
+
         OWSAssert(currentMessage.date);
         OWSAssert(previousMessage.date);
         NSTimeInterval timeDifference = [currentMessage.date timeIntervalSinceDate:previousMessage.date];