diff --git a/packages/react/src/components/Comments/Comment.tsx b/packages/react/src/components/Comments/Comment.tsx
index 26f940892e..55c3e1af23 100644
--- a/packages/react/src/components/Comments/Comment.tsx
+++ b/packages/react/src/components/Comments/Comment.tsx
@@ -51,20 +51,17 @@ export const Comment = ({
 
   const dict = useDictionary();
 
-  const commentEditor = useCreateBlockNote(
-    {
-      initialContent: comment.body,
-      trailingBlock: false,
-      dictionary: {
-        ...dict,
-        placeholders: {
-          emptyDocument: dict.placeholders.edit_comment,
-        },
+  const commentEditor = useCreateBlockNote({
+    initialContent: comment.body,
+    trailingBlock: false,
+    dictionary: {
+      ...dict,
+      placeholders: {
+        emptyDocument: dict.placeholders.edit_comment,
       },
-      schema: editor.comments.commentEditorSchema || defaultCommentEditorSchema,
     },
-    [comment.body],
-  );
+    schema: editor.comments.commentEditorSchema || defaultCommentEditorSchema,
+  });
 
   const Components = useComponentsContext()!;
 
diff --git a/packages/react/src/components/Comments/Comments.tsx b/packages/react/src/components/Comments/Comments.tsx
index b48796a205..ab6203a6f6 100644
--- a/packages/react/src/components/Comments/Comments.tsx
+++ b/packages/react/src/components/Comments/Comments.tsx
@@ -23,7 +23,7 @@ export const Comments = ({
   // Maps all comments to elements.
   const comments = thread.comments.map((comment, index) => (
     <Comment
-      key={comment.id}
+      key={comment.id + JSON.stringify(comment.body || "{}")}
       thread={thread}
       comment={comment}
       showResolveButton={index === 0}