diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index e0734b9aa..1bef2f1da 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -49,7 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
     _creationTimestamp = [NSDate new];
 
     [self ensureFilePath];
-    [self ensureThumbnail];
 
     return self;
 }
@@ -72,7 +71,6 @@ NS_ASSUME_NONNULL_BEGIN
     _creationTimestamp = [NSDate new];
 
     [self ensureFilePath];
-    [self ensureThumbnail];
 
     return self;
 }
@@ -98,6 +96,12 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
+- (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
+{
+    [super saveWithTransaction:transaction];
+    [self ensureThumbnail];
+}
+
 - (void)upgradeFromAttachmentSchemaVersion:(NSUInteger)attachmentSchemaVersion
 {
     [super upgradeFromAttachmentSchemaVersion:attachmentSchemaVersion];