diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index 9152588481c41eb9ce9922c36ed26e7b16aad73f..31eaea8002145c3d913a64424130e5d2b15c9241 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -136,6 +136,7 @@ const updateMarks = view => {
     const allBlockNodes = DocumentHelpers.findBlockNodes(view.state.doc);
     const allInlineNodes = DocumentHelpers.findInlineNodes(view.state.doc);
     const finalMarks = [];
+    const finalNodes = [];
 
     allInlineNodes.map(node => {
       if (node.node.marks.length > 0) {
@@ -151,6 +152,11 @@ const updateMarks = view => {
         });
       }
     });
+    allBlockNodes.map(node => {
+      if (node.node.attrs.track && node.node.attrs.track.length > 0) {
+        finalNodes.push(node);
+      }
+    });
 
     const groupedNodes = {};
     uniqBy(finalMarks, "attrs.id").forEach(mark => {
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
index 08581b9b12d849989e6f910156bcff88ddb5c2b9..d54fed37a9bd3efff2363c183529218b9d8deba3 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
@@ -38,7 +38,7 @@ const markWrapping = (tr, pos, oldNode, newNode, user, date, group) => {
   tr.setNodeMarkup(
     pos,
     null,
-    Object.assign({}, newNode.attrs, { track, group })
+    Object.assign({}, newNode.attrs, { track, group, id: uuidv4() })
   );
 };