diff --git a/js/src/forum/components/CommentPost.js b/js/src/forum/components/CommentPost.js
index 5d19a1f27..1568f9ccd 100644
--- a/js/src/forum/components/CommentPost.js
+++ b/js/src/forum/components/CommentPost.js
@@ -50,7 +50,9 @@ export default class CommentPost extends Post {
       <header className="Post-header">
         <ul>{listItems(this.headerItems().toArray())}</ul>
       </header>,
-      <div className="Post-body">{this.isEditing() ? <TextFormatterPreview /> : m.trust(this.attrs.post.contentHtml())}</div>,
+      <div className="Post-body">
+        {this.isEditing() ? <TextFormatterPreview content={() => app.composer.fields.content()} /> : m.trust(this.attrs.post.contentHtml())}
+      </div>,
     ]);
   }
 
diff --git a/js/src/forum/components/TextFormatterPreview.js b/js/src/forum/components/TextFormatterPreview.js
index a3de7dd9c..203c04b0f 100644
--- a/js/src/forum/components/TextFormatterPreview.js
+++ b/js/src/forum/components/TextFormatterPreview.js
@@ -14,7 +14,7 @@ export default class TextFormatterPreview extends Component {
     // body with a preview.
     let preview;
     const updatePreview = () => {
-      const content = app.composer.fields.content();
+      const content = this.attrs.content();
 
       if (preview === content) return;