diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
index 706854f74..34b483b3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -1274,6 +1274,7 @@ public class AttachmentDatabase extends Database {
       boolean useTemplateUpload = template.getUploadTimestamp() > attachment.getUploadTimestamp() &&
                                   template.getTransferState() == TRANSFER_PROGRESS_DONE           &&
                                   template.getTransformProperties().shouldSkipTransform()         &&
+                                  template.getDigest() != null                                    &&
                                   !attachment.getTransformProperties().isVideoEdited();
 
       ContentValues contentValues = new ContentValues();