diff --git a/Signal/src/Models/TSMessageAdapaters/TSGenericAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSGenericAttachmentAdapter.m
index 7119965af..bbbed9e85 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSGenericAttachmentAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSGenericAttachmentAdapter.m
@@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         NSString *filename = self.attachment.sourceFilename;
         if (!filename) {
-            filename = [self.attachment localFilePathWithoutTransaction];
+            filename = [[self.attachment localFilePath] lastPathComponent];
         }
         NSString *fileExtension = filename.pathExtension;
         if (fileExtension.length < 1) {
@@ -207,8 +207,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         NSError *error;
         unsigned long long fileSize =
-            [[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachment localFilePathWithoutTransaction]
-                                                             error:&error]
+            [[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachment localFilePath] error:&error]
                 .fileSize;
         OWSAssert(!error);
         NSString *bottomText = [ViewControllerUtils formatFileSize:fileSize];
diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
index 5f28eee1b..5cf72f98c 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
@@ -289,7 +289,7 @@ NS_ASSUME_NONNULL_BEGIN
     const CGFloat kLabelVSpacing = 2;
     NSString *filename = self.attachment.sourceFilename;
     if (!filename) {
-        filename = [self.attachment localFilePathWithoutTransaction];
+        filename = [[self.attachment localFilePath] lastPathComponent];
     }
     NSString *topText = [[filename stringByDeletingPathExtension]
         stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];