diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 8861e583abfe68ced8052f294cb0099d216d1960..f94f3052ff5e1da3bce56e466df5dddf48c2d417 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -51,7 +51,7 @@ const Editoria = () => (
       // value={`<p class="paragraph"><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">and a </span><span class="insertion" data-id="" data-user="1234" data-username="demo" data-date="26541557" data-group=""><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">sdasdssd</span></span><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">paragraph</span></p><p class="paragraph">more</p>`}
       layout={EditoriaLayout}
       TrackChange
-      onChange={source => console.log(source)}
+      // onChange={source => console.log(source)}
       user={user}
     />
   </Fragment>
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index 31eaea8002145c3d913a64424130e5d2b15c9241..e23a710e7cbfecb9cc04fdd835c321f3f26df9e4 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -152,6 +152,7 @@ const updateMarks = view => {
         });
       }
     });
+
     allBlockNodes.map(node => {
       if (node.node.attrs.track && node.node.attrs.track.length > 0) {
         finalNodes.push(node);
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
index 77e3081a77dd13da9002ff66b4aba35564f4e5ef..6c2629ca074cd5d74a1e2d2176a01413ceb0e27f 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
@@ -14,7 +14,10 @@ const addMarkStep = (state, tr, step, newTr, map, doc, user, date, group) => {
         step.mark
       );
     }
-    if (!node.marks.find(mark => mark.type === step.mark.type)) {
+    if (
+      !["comment"].includes(step.mark.type.name) &&
+      !node.marks.find(mark => mark.type === step.mark.type)
+    ) {
       const formatChangeMark = node.marks.find(
         mark => mark.type.name === "format_change"
       );