diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index f9ddeebc5..b41dc85c3 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -358,8 +358,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     OWSAssert(transaction);
     OWSAssert(!self.hasViewState);
 
-    OWSAssert([self.interaction isKindOfClass:[TSOutgoingMessage class]] ||
-        [self.interaction isKindOfClass:[TSIncomingMessage class]]);
+    if (![self.interaction isKindOfClass:[TSOutgoingMessage class]]
+        && ![self.interaction isKindOfClass:[TSIncomingMessage class]]) {
+        // Only text & attachment messages have "view state".
+        return;
+    }
 
     self.hasViewState = YES;