diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m
index dad0364d0..cad76760f 100644
--- a/src/Messages/OWSMessageSender.m
+++ b/src/Messages/OWSMessageSender.m
@@ -516,6 +516,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
     dispatch_async([OWSDispatch attachmentsQueue], ^{
         TSAttachmentStream *attachmentStream =
             [[TSAttachmentStream alloc] initWithContentType:contentType filename:filename];
+        if (message.isVoiceMessage) {
+            attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage;
+        }
 
         NSError *error;
         [attachmentStream writeData:dataCopy error:&error];