diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
index 19a709d25..55407c25a 100644
--- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -143,11 +143,6 @@ class AppLockServiceMock: AppLockServiceProtocol {
         set(value) { underlyingBiometricUnlockTrusted = value }
     }
     var underlyingBiometricUnlockTrusted: Bool!
-    var disabledPublisher: AnyPublisher<Void, Never> {
-        get { return underlyingDisabledPublisher }
-        set(value) { underlyingDisabledPublisher = value }
-    }
-    var underlyingDisabledPublisher: AnyPublisher<Void, Never>!
     var numberOfPINAttempts: AnyPublisher<Int, Never> {
         get { return underlyingNumberOfPINAttempts }
         set(value) { underlyingNumberOfPINAttempts = value }
diff --git a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
index 353a3e1d6..73df9459b 100644
--- a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
+++ b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
@@ -74,6 +74,19 @@ final class PillAttachmentViewProvider: NSTextAttachmentViewProvider {
         self.view = controller.view
         delegate?.registerPillView(controller.view)
     }
+    
+    // MARK: - NSSecureCoding
+    
+    // Fixes crashes when inserting mention pills in the composer on Mac
+    // https://github.com/vector-im/element-x-ios/issues/2070
+    
+    static var supportsSecureCoding = false
+    
+    func encode(with coder: NSCoder) { }
+    
+    init?(coder: NSCoder) {
+        fatalError("Not implemented")
+    }
 }
 
 final class ComposerMentionDisplayHelper: MentionDisplayHelper {
diff --git a/changelog.d/2070.bugfix b/changelog.d/2070.bugfix
new file mode 100644
index 000000000..2b93da255
--- /dev/null
+++ b/changelog.d/2070.bugfix
@@ -0,0 +1 @@
+Prevent crashes when inserting mention pills in the composers on Mac
\ No newline at end of file