diff --git a/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift b/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
index 7d3809c596a..83534e1344a 100644
--- a/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
+++ b/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
@@ -87,14 +87,14 @@ public class AttachmentStream {
     /// will instead be inferred from the file contents) and made url-safe AND user-friendly. If nil, a random file name is used.
     public func makeDecryptedCopy(filename: String?) throws -> URL {
         var pathExtension: String = {
-            if let pathExtension = MimeTypeUtil.fileExtensionForMimeType(mimeType) {
-                return pathExtension
-            } else if
+            if
                 let filename,
                 let filenameUrl = URL(string: filename),
                 let pathExtension = filenameUrl.pathExtension.nilIfEmpty
             {
                 return pathExtension
+            } else if let pathExtension = MimeTypeUtil.fileExtensionForMimeType(mimeType) {
+                return pathExtension
             } else {
                 return "bin"
             }