diff --git a/Riot/Modules/Room/RoomViewController.swift b/Riot/Modules/Room/RoomViewController.swift
index 7bbc6812c..09366bced 100644
--- a/Riot/Modules/Room/RoomViewController.swift
+++ b/Riot/Modules/Room/RoomViewController.swift
@@ -84,7 +84,7 @@ extension RoomViewController {
                             "event_id": eventModified.eventId
                         ])
                 })
-            } else {
+            } else if !self.send(asIRCStyleCommandIfPossible: rawTextMsg) {
                 roomDataSource.sendFormattedTextMessage(rawTextMsg, html: htmlMsg) { response in
                     switch response {
                     case .success:
diff --git a/changelog.d/6962.bugfix b/changelog.d/6962.bugfix
new file mode 100644
index 000000000..bacf91561
--- /dev/null
+++ b/changelog.d/6962.bugfix
@@ -0,0 +1 @@
+Fixed IRC-style message and commands support in Rich text editor