diff --git a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
index a9ea8f150..ff005bb31 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -112,6 +112,7 @@ export class CommentForm extends React.Component {
           disabled={disableTextArea}
           charCountEnable={this.props.charCountEnable}
           maxCharCount={this.props.maxCharCount}
+          comment={this.props.comment}
         />
         <div className={cn(styles.buttonContainer, `${name}-button-container`)}>
           {this.props.buttonContainerStart}
diff --git a/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js b/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
index c1678d0a7..2e45cf97c 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
@@ -38,6 +38,7 @@ export default class DraftArea extends React.Component {
       charCountEnable,
       maxCharCount,
       onChange,
+      comment,
     } = this.props;
 
     const tASettings = {
@@ -47,6 +48,7 @@ export default class DraftArea extends React.Component {
       onChange,
       rows,
       disabled,
+      comment,
     };
 
     return (
diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index 257860342..75f0d1246 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -140,6 +140,7 @@ export class EditableCommentContent extends React.Component {
     return (
       <div className={styles.editCommentForm}>
         <CommentForm
+          comment={this.props.comment}
           defaultValue={this.props.comment.body}
           bodyInputId={id}
           charCountEnable={this.props.charCountEnable}
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/DraftArea.js b/client/coral-embed-stream/src/tabs/stream/containers/DraftArea.js
index 335525066..42cf5462b 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/DraftArea.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/DraftArea.js
@@ -50,6 +50,7 @@ export default class DraftAreaContainer extends React.Component {
         charCountEnable={this.props.charCountEnable}
         maxCharCount={this.props.maxCharCount}
         label={this.props.label}
+        comment={this.props.comment}
       />
     );
   }
diff --git a/plugins/talk-plugin-rte/client/components/CommentContent.js b/plugins/talk-plugin-rte/client/components/CommentContent.js
index 28a7d67fe..e9f33fee5 100644
--- a/plugins/talk-plugin-rte/client/components/CommentContent.js
+++ b/plugins/talk-plugin-rte/client/components/CommentContent.js
@@ -1,15 +1,23 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { name } from '../../package.json';
 
-const CommentContent = ({ comment }) => {
-  return comment.htmlBody ? (
-    <div
-      className={`${name}-text`}
-      dangerouslySetInnerHTML={{ __html: comment.htmlBody }}
-    />
-  ) : (
-    <div className={`${name}-text`}>{comment.body}</div>
-  );
+class CommentContent extends React.Component {
+  render() {
+    const { comment } = this.props;
+    return comment.htmlBody ? (
+      <div
+        className={`${name}-text`}
+        dangerouslySetInnerHTML={{ __html: comment.htmlBody }}
+      />
+    ) : (
+      <div className={`${name}-text`}>{comment.body}</div>
+    );
+  }
+}
+
+CommentContent.propTypes = {
+  comment: PropTypes.object.isRequired,
 };
 
 export default CommentContent;
diff --git a/plugins/talk-plugin-rte/client/components/Editor.js b/plugins/talk-plugin-rte/client/components/Editor.js
index 8d2d84f00..a6bc4240a 100644
--- a/plugins/talk-plugin-rte/client/components/Editor.js
+++ b/plugins/talk-plugin-rte/client/components/Editor.js
@@ -36,10 +36,16 @@ class Editor extends React.Component {
         button: cn(styles.button, classNames.button, `${pluginName}-button`),
       },
     });
+
+    // To edit comments and have the previous html comment
+    if (this.props.comment && this.props.comment.htmlBody) {
+      this.ref.content.innerHTML = this.props.comment.htmlBody;
+    }
   }
 
   render() {
     const { id, classNames } = this.props;
+    console.log(this.props);
     return (
       <div
         id={id}