diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
index 05469baf1..a1f73a001 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
@@ -79,6 +79,12 @@ private struct UITextViewWrapper: UIViewRepresentable {
         textView.textContainer.lineFragmentPadding = 0.0
         textView.textContainerInset = .zero
         textView.keyboardType = .default
+        
+        // AutoCorrection doesn't work properly when running on the Mac
+        // https://github.com/element-hq/element-x-ios/issues/1786
+        if ProcessInfo.processInfo.isiOSAppOnMac {
+            textView.autocorrectionType = .no
+        }
 
         textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)