diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index 650ac105b..16690ac5d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -696,9 +696,9 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 
     if (self.hasBodyText) {
         if (self.messageCellType == OWSMessageCellType_Unknown) {
-            OWSAssertDebug(message.attachmentIds.count == 0
-                || (message.attachmentIds.count == 1 &&
-                       [message oversizeTextAttachmentWithTransaction:transaction] != nil));
+//            OWSAssertDebug(message.attachmentIds.count == 0
+//                || (message.attachmentIds.count == 1 &&
+//                       [message oversizeTextAttachmentWithTransaction:transaction] != nil));
             self.messageCellType = OWSMessageCellType_TextOnlyMessage;
         }
         OWSAssertDebug(self.displayableBodyText);
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 283b00f89..bb68e62a1 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -738,7 +738,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
                                  TSOutgoingMessageRecipientState *_Nullable recipientState
                                      = message.recipientStateMap[recipientId];
                                  if (!recipientState) {
-                                     OWSFailDebug(@"Missing recipient state for delivered recipient: %@", recipientId);
+                                     // OWSFailDebug(@"Missing recipient state for delivered recipient: %@", recipientId);
                                      return;
                                  }
                                  if (recipientState.state != OWSOutgoingMessageRecipientStateSent) {
@@ -762,7 +762,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
                                  TSOutgoingMessageRecipientState *_Nullable recipientState
                                      = message.recipientStateMap[recipientId];
                                  if (!recipientState) {
-                                     OWSFailDebug(@"Missing recipient state for delivered recipient: %@", recipientId);
+                                     // OWSFailDebug(@"Missing recipient state for delivered recipient: %@", recipientId);
                                      return;
                                  }
                                  if (recipientState.state != OWSOutgoingMessageRecipientStateSent) {