diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
index ce412edcef..86255ad0a8 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposerTextField.swift
@@ -190,8 +190,8 @@ private struct UITextViewWrapper: UIViewRepresentable {
         }
         
         func textViewDidChangeSelection(_ textView: UITextView) {
-            if selectedRange.wrappedValue != textView.selectedRange {
-                DispatchQueue.main.async {
+            DispatchQueue.main.async {
+                if self.selectedRange.wrappedValue != textView.selectedRange {
                     self.selectedRange.wrappedValue = textView.selectedRange
                 }
             }