diff --git a/app/components/markdown/markdown_emoji/__snapshots__/markdown_emoji.test.js.snap b/app/components/markdown/markdown_emoji/__snapshots__/markdown_emoji.test.js.snap
index 43bc80abf..70c165a05 100644
--- a/app/components/markdown/markdown_emoji/__snapshots__/markdown_emoji.test.js.snap
+++ b/app/components/markdown/markdown_emoji/__snapshots__/markdown_emoji.test.js.snap
@@ -31,3 +31,164 @@ exports[`MarkdownEmoji should match snapshot 1`] = `
   </Unknown>
 </Unknown>
 `;
+
+exports[`MarkdownEmoji should render with hardbreaks 1`] = `
+<Unknown
+  context={Array []}
+  first={true}
+  last={true}
+  literal={null}
+  nodeKey="22"
+>
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    emojiName="fire"
+    literal=":fire:"
+    nodeKey="4"
+  >
+    <Unknown
+      context={
+        Array [
+          "paragraph",
+          "emoji",
+        ]
+      }
+      literal=":fire:"
+      nodeKey="3"
+    />
+  </Unknown>
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    literal=" "
+    nodeKey="5"
+  />
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    emojiName="fire"
+    literal=":fire:"
+    nodeKey="8"
+  >
+    <Unknown
+      context={
+        Array [
+          "paragraph",
+          "emoji",
+        ]
+      }
+      literal=":fire:"
+      nodeKey="7"
+    />
+  </Unknown>
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    literal=""
+    nodeKey="9"
+  />
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    literal={null}
+    nodeKey="10"
+  />
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    emojiName="fire"
+    literal=":fire:"
+    nodeKey="13"
+  >
+    <Unknown
+      context={
+        Array [
+          "paragraph",
+          "emoji",
+        ]
+      }
+      literal=":fire:"
+      nodeKey="12"
+    />
+  </Unknown>
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    literal=" "
+    nodeKey="14"
+  />
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    emojiName="fire"
+    literal=":fire:"
+    nodeKey="17"
+  >
+    <Unknown
+      context={
+        Array [
+          "paragraph",
+          "emoji",
+        ]
+      }
+      literal=":fire:"
+      nodeKey="16"
+    />
+  </Unknown>
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    literal=" "
+    nodeKey="18"
+  />
+  <Unknown
+    context={
+      Array [
+        "paragraph",
+      ]
+    }
+    emojiName="fire"
+    literal=":fire:"
+    nodeKey="21"
+  >
+    <Unknown
+      context={
+        Array [
+          "paragraph",
+          "emoji",
+        ]
+      }
+      literal=":fire:"
+      nodeKey="20"
+    />
+  </Unknown>
+</Unknown>
+`;
diff --git a/app/components/markdown/markdown_emoji/markdown_emoji.js b/app/components/markdown/markdown_emoji/markdown_emoji.js
index e9995b80d..7fae0381d 100644
--- a/app/components/markdown/markdown_emoji/markdown_emoji.js
+++ b/app/components/markdown/markdown_emoji/markdown_emoji.js
@@ -39,6 +39,7 @@ export default class MarkdownEmoji extends PureComponent {
                 paragraph: this.renderParagraph,
                 document: this.renderParagraph,
                 text: this.renderText,
+                hardbreak: this.renderNewLine,
             },
         });
     };
@@ -73,10 +74,14 @@ export default class MarkdownEmoji extends PureComponent {
 
     renderText = ({context, literal}) => {
         const style = this.computeTextStyle(this.props.baseTextStyle, context);
-
         return <Text style={style}>{literal}</Text>;
     };
 
+    renderNewLine = ({context}) => {
+        const style = this.computeTextStyle(this.props.baseTextStyle, context);
+        return <Text style={style}>{'\n'}</Text>;
+    }
+
     renderEditedIndicator = ({context}) => {
         let spacer = '';
         if (context[0] === 'paragraph') {
@@ -101,7 +106,7 @@ export default class MarkdownEmoji extends PureComponent {
     };
 
     render() {
-        const ast = this.parser.parse(this.props.value);
+        const ast = this.parser.parse(this.props.value.replace(/\n*$/, ''));
 
         if (this.props.isEdited) {
             const editIndicatorNode = new Node('edited_indicator');
diff --git a/app/components/markdown/markdown_emoji/markdown_emoji.test.js b/app/components/markdown/markdown_emoji/markdown_emoji.test.js
index 327c016c7..666dc9020 100644
--- a/app/components/markdown/markdown_emoji/markdown_emoji.test.js
+++ b/app/components/markdown/markdown_emoji/markdown_emoji.test.js
@@ -24,4 +24,17 @@ describe('MarkdownEmoji', () => {
 
         expect(wrapper.getElement()).toMatchSnapshot();
     });
+
+    test('should render with hardbreaks', () => {
+        const wrapper = shallow(
+            <MarkdownEmoji
+                {...baseProps}
+                value={`:fire: :fire:       
+               :fire: :fire: :fire:
+               `}
+            />,
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
 });