diff --git a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
index d525de58a9acb9239d4c371027702ab6583d3184..ccbae044b3bc72d1dbb9bd8f446d9bac6bc5d011 100644
--- a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
+++ b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
@@ -99,6 +99,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
         node.type.name === 'figure'
       ) {
         const track = node.attrs.track.slice();
+        console.log('viewId', viewId);
         track.push({
           type: 'deletion',
           user: user.userId,
@@ -108,6 +109,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
           group,
           viewid: viewId,
         });
+        console.log('track', track);
         tr.setNodeMarkup(
           deletionMap.map(pos),
           null,
@@ -115,6 +117,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
             track,
             group,
             id: uuidv4(),
+            viewid: viewId,
           }),
           // Object.assign(node.attrs.track, { track }),
           node.marks,
diff --git a/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js b/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
index 98fd4204711fea0b3230761d7ef656eb6ee6a77d..dd5bc0164d80cb49f7388bf5a94bc194f02a6ea9 100644
--- a/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
+++ b/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
@@ -68,7 +68,9 @@ const replaceStep = (
     }
   }
   if (step.from !== step.to) {
-    map.appendMap(markDeletion(newTr, step.from, step.to, user, date, group));
+    map.appendMap(
+      markDeletion(newTr, step.from, step.to, user, date, group, viewId),
+    );
   }
 };
 
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
index c8ffdd9231d3615fe1f379f557d54fd41a7ee1c6..4faf2eafffc8e2453082a7f1b046de1a1f878ba3 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
@@ -58,6 +58,8 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
   };
 
   const focusOnBlcock = trackData => {
+    console.log(trackData);
+    console.log(pmViews, viewId);
     pmViews[viewId].dispatch(
       pmViews[viewId].state.tr.setSelection(
         new TextSelection(