diff --git a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
index afa95ac00..0959e9607 100644
--- a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
+++ b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
@@ -27,7 +27,7 @@ protocol PillAttachmentViewProviderDelegate: AnyObject {
     func invalidateTextAttachmentsDisplay()
 }
 
-final class PillAttachmentViewProvider: NSTextAttachmentViewProvider {
+final class PillAttachmentViewProvider: NSTextAttachmentViewProvider, NSSecureCoding {
     private weak var delegate: PillAttachmentViewProviderDelegate?
     
     // MARK: - Override
diff --git a/changelog.d/2627.bugfix b/changelog.d/2627.bugfix
new file mode 100644
index 000000000..3a5284164
--- /dev/null
+++ b/changelog.d/2627.bugfix
@@ -0,0 +1 @@
+Prevent crashes when mentioning users when running on the Mac
\ No newline at end of file