diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 74573cb50..cd8d1bceb 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -712,11 +712,14 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(attachmentView);
     OWSAssert(attachmentStateCallback);
+    OWSAssert(self.attachmentStream);
 
     if (self.isOutgoing) {
-        self.attachmentUploadView = [[AttachmentUploadView alloc] initWithAttachment:self.attachmentStream
-                                                                           superview:attachmentView
-                                                             attachmentStateCallback:attachmentStateCallback];
+        if (!self.attachmentStream.isUploaded) {
+            self.attachmentUploadView = [[AttachmentUploadView alloc] initWithAttachment:self.attachmentStream
+                                                                               superview:attachmentView
+                                                                 attachmentStateCallback:attachmentStateCallback];
+        }
     }
 }