diff --git a/src/features/messages/persistence/messagesPayload.ts b/src/features/messages/persistence/messagesPayload.ts
index bb0435e7..b6b8d207 100644
--- a/src/features/messages/persistence/messagesPayload.ts
+++ b/src/features/messages/persistence/messagesPayload.ts
@@ -74,7 +74,7 @@ export const withRemoteContent = (
     third_party_data: {
       ...message.content.third_party_data,
       id: message.id as NonEmptyString,
-      has_attachments: true
+      has_attachments: template.attachmentCount > 0
     }
   },
   third_party_message: {