diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift
index 045fcc9a49..8d776d7e91 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift
@@ -20,8 +20,9 @@ import GBDeviceInfo
 
 extension RoomInputToolbarView {
     open override func sendCurrentMessage() {
-        // Triggers auto-correct if needed.
-        if self.isFirstResponder {
+        // Triggers auto-correct if needed and if it is not a command.
+        let isCommand = self.textMessage.hasPrefix("/")
+        if self.isFirstResponder && !isCommand {
             let temp = UITextField(frame: .zero)
             temp.isHidden = true
             self.addSubview(temp)
diff --git a/changelog.d/7424.bugfix b/changelog.d/7424.bugfix
new file mode 100644
index 0000000000..37e88bdfc6
--- /dev/null
+++ b/changelog.d/7424.bugfix
@@ -0,0 +1 @@
+Input command should not be auto-corrected
\ No newline at end of file