diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 6efddfc18..f17e7adec 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -661,6 +661,7 @@ export default class Comment extends React.Component {
 
         {activeReplyBox === comment.id ? (
           <ReplyBox
+            comment={comment}
             commentPostedHandler={this.commentPostedHandler}
             charCountEnable={charCountEnable}
             maxCharCount={maxCharCount}
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 8055d3d1c..ed4bfb602 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -50,6 +50,7 @@ class CommentForm extends React.Component {
     onCancel: PropTypes.func,
     state: PropTypes.string,
     loadingState: PropTypes.oneOf(['', 'loading', 'success', 'error']),
+    comment: PropTypes.object,
   };
   static get defaultProps() {
     return {
@@ -87,6 +88,7 @@ class CommentForm extends React.Component {
       charCountEnable,
       body,
       loadingState,
+      comment,
     } = this.props;
 
     const length = body.length;
@@ -104,6 +106,7 @@ class CommentForm extends React.Component {
     return (
       <div>
         <DraftArea
+          comment={comment}
           id={this.props.bodyInputId}
           label={this.props.bodyLabel}
           value={body}
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
index 12d074fdd..9260ad0cc 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
@@ -27,10 +27,12 @@ class ReplyBox extends React.Component {
       commentPostedHandler,
       maxCharCount,
       charCountEnable,
+      comment,
     } = this.props;
     return (
       <div className={cn(styles.container, `${name}-textarea`)}>
         <CommentBox
+          comment={comment}
           maxCharCount={maxCharCount}
           charCountEnable={charCountEnable}
           commentPostedHandler={commentPostedHandler}
@@ -48,6 +50,7 @@ class ReplyBox extends React.Component {
 }
 
 ReplyBox.propTypes = {
+  comment: PropTypes.object,
   charCountEnable: PropTypes.bool.isRequired,
   maxCharCount: PropTypes.number,
   setActiveReplyBox: PropTypes.func.isRequired,
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index c64fe525d..a59ba2806 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -146,7 +146,7 @@ class CommentBox extends React.Component {
   };
 
   render() {
-    const { isReply, maxCharCount, assetId, parentId } = this.props;
+    const { isReply, maxCharCount, assetId, parentId, comment } = this.props;
     let { onCancel } = this.props;
 
     if (isReply && typeof onCancel !== 'function') {
@@ -164,6 +164,7 @@ class CommentBox extends React.Component {
     return (
       <div>
         <CommentForm
+          comment={comment}
           defaultValue={this.props.defaultValue}
           bodyLabel={isReply ? t('comment_box.reply') : t('comment.comment')}
           maxCharCount={maxCharCount}
@@ -205,6 +206,7 @@ CommentBox.propTypes = {
   canPost: PropTypes.bool,
   notify: PropTypes.func.isRequired,
   tags: PropTypes.array,
+  comment: PropTypes.object,
 };
 
 CommentBox.fragments = CommentForm.fragments;
diff --git a/plugins/talk-plugin-rich-text-pell/client/components/Editor.js b/plugins/talk-plugin-rich-text-pell/client/components/Editor.js
index b7d7467b8..2faedb633 100644
--- a/plugins/talk-plugin-rich-text-pell/client/components/Editor.js
+++ b/plugins/talk-plugin-rich-text-pell/client/components/Editor.js
@@ -36,7 +36,6 @@ class Editor extends React.Component {
       },
     });
 
-    console.log('comment', this.props.comment);
     // To edit comments and have the previous html comment
     if (this.props.comment && this.props.comment.richTextBody) {
       this.ref.content.innerHTML = this.props.comment.richTextBody;