diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
index 496bf16ce..a179ba28e 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
@@ -96,7 +96,7 @@ const singleCommentFragment = gql`
       edited
       editableUntil
     }
-    ${getSlotFragmentSpreads(slots, 'comment')}.
+    ${getSlotFragmentSpreads(slots, 'comment')}
     ...${getDefinitionName(CommentBox.fragments.comment)}
     ${CommentBox.fragments.comment}
   }
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 17237de21..2b321df5a 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -6,7 +6,6 @@ import { getDefinitionName } from 'coral-framework/utils';
 import t, { timeago } from 'coral-framework/services/i18n';
 import { can } from 'coral-framework/services/perms';
 import { isSuspended } from 'coral-framework/utils/user';
-import DraftArea from './DraftArea';
 import Slot from 'coral-framework/components/Slot';
 import { connect } from 'react-redux';
 import CommentForm from '../containers/CommentForm';
@@ -222,9 +221,9 @@ export default compose(
     comment: gql`
     fragment TalkEmbedStream_CommentBox_comment on Comment {
       __typename
-      ...${getDefinitionName(DraftArea.fragments.comment)}
+      ...${getDefinitionName(CommentForm.fragments.comment)}
     }
-    ${DraftArea.fragments.comment}
+    ${CommentForm.fragments.comment}
 `,
   })
 )(CommentBox);
diff --git a/services/comments.js b/services/comments.js
index 872f3528f..d7e151938 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -108,11 +108,11 @@ module.exports = class CommentsService {
     };
 
     const originalComment = await CommentModel.findOneAndUpdate(query, {
-      $set: {
+      $set: dotize({
         body,
         status,
-        metadata: dotize(metadata),
-      },
+        metadata,
+      }),
       $push: {
         body_history: {
           body,