diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 0283b156e..077d30d46 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -809,7 +809,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
 - (UIView *)loadViewForMedia
 {
     OWSAssertDebug(self.attachmentStream);
-    OWSAssertDebug([self.attachmentStream isImage]);
+    OWSAssertDebug([self.attachmentStream isVisualMedia]);
 
     ConversationMediaView *mediaView =
         [[ConversationMediaView alloc] initWithMediaCache:self.cellMediaCache attachment:self.attachmentStream];
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index a4ec3029f..d5f092c86 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -217,7 +217,7 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 - (BOOL)isMediaGalleryWithTransaction:(YapDatabaseReadTransaction *)transaction
 {
     NSArray<TSAttachment *> *attachments = [self attachmentsWithTransaction:transaction];
-    if (attachments.count < 1) {
+    if (attachments.count < 2) {
         return NO;
     }
     for (TSAttachment *attachment in attachments) {