diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index b05beb2571..cca0a9899c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -509,7 +509,7 @@ export default class MessageComposerInput extends React.Component {
         if (this.state.isRichtextEnabled) {
             contentHTML = HtmlUtils.stripParagraphs(
                 RichText.contentStateToHTML(contentState),
-            );
+            ).replace(/\<br\>\n/g, '<br>');
         } else {
             const md = new Markdown(contentText);
             if (md.isPlainText()) {