diff --git a/SignalServiceKit/Attachments/SignalAttachment.swift b/SignalServiceKit/Attachments/SignalAttachment.swift
index e71446feb16..410a9087298 100644
--- a/SignalServiceKit/Attachments/SignalAttachment.swift
+++ b/SignalServiceKit/Attachments/SignalAttachment.swift
@@ -928,7 +928,7 @@ public class SignalAttachment: NSObject {
             // transparent pixels (all screenshots fall into this bucket)
             // and there is not a simple, performant way, to check if there
             // are any transparent pixels in an image.
-            if dataSource.hasStickerLikeProperties {
+            if dataSource.hasStickerLikeProperties || attachment.fileExtension == "png" {
                 dataFileExtension = "png"
                 dataType = .png
             } else {