diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 83e717d55d..80fdf470e3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -488,8 +488,7 @@ export default class MessageComposerInput extends React.Component {
         const currentContent = this.state.editorState.getCurrentContent();
 
         let contentState = null;
-
-        if (html) {
+        if (html && this.state.isRichtextEnabled) {
             contentState = Modifier.replaceWithFragment(
                 currentContent,
                 currentSelection,