diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
index 5159c7e1c8..6fcc40d84d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
@@ -145,6 +145,11 @@ class PointerAttachment : Attachment {
         return Optional.empty()
       }
 
+      val cdn = Cdn.fromCdnNumber(thumbnail?.asPointer()?.cdnNumber ?: 0)
+      if (cdn == Cdn.S3) {
+        return Optional.empty()
+      }
+
       return Optional.of(
         PointerAttachment(
           quote = true,
@@ -153,7 +158,7 @@ class PointerAttachment : Attachment {
           transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
           size = (if (thumbnail != null) thumbnail.asPointer().size.orElse(0) else 0).toLong(),
           fileName = quotedAttachment.fileName,
-          cdn = Cdn.fromCdnNumber(thumbnail?.asPointer()?.cdnNumber ?: 0),
+          cdn = cdn,
           location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
           key = thumbnail?.asPointer()?.key?.let { Base64.encodeWithPadding(it) },
           iv = null,