diff --git a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
index 1afcff056..09d5ace8f 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
@@ -256,6 +256,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)canPerformEditingAction:(SEL)action
 {
+    if ([self attachmentStream] && ![self attachmentStream].isUploaded) {
+        return NO;
+    }
+
     // Deletes are always handled by TSMessageAdapter
     if (action == @selector(delete:)) {
         return YES;