diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
index 4da7666878..66284e413e 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -2331,7 +2331,7 @@ private void addInternalProductAttr(AttributeMutationContext ctx, List<Object> c
     private void addOrRemoveDaapInternalAttr(AtlasVertex toVertex, String internalAttr, List<Object> createdElements, List<AtlasEdge> deletedElements) {
         if (CollectionUtils.isNotEmpty(createdElements)) {
             List<String> addedGuids = createdElements.stream().map(x -> ((AtlasEdge) x).getOutVertex().getProperty("__guid", String.class)).collect(Collectors.toList());
-            //addedGuids.forEach(guid -> AtlasGraphUtilsV2.addEncodedProperty(toVertex, internalAttr, guid));
+            addedGuids.forEach(guid -> AtlasGraphUtilsV2.addEncodedProperty(toVertex, internalAttr, guid));
 
             if (internalAttr.equals(OUTPUT_PORT_GUIDS_ATTR)) {
                 RequestContext.get().setAddedOutputPorts(addedGuids);
@@ -2340,7 +2340,7 @@ private void addOrRemoveDaapInternalAttr(AtlasVertex toVertex, String internalAt
 
         if (CollectionUtils.isNotEmpty(deletedElements)) {
             List<String> removedGuids = deletedElements.stream().map(x -> x.getOutVertex().getProperty("__guid", String.class)).collect(Collectors.toList());
-            //removedGuids.forEach(guid -> AtlasGraphUtilsV2.removeItemFromListPropertyValue(toVertex, internalAttr, guid));
+            removedGuids.forEach(guid -> AtlasGraphUtilsV2.removeItemFromListPropertyValue(toVertex, internalAttr, guid));
 
             if (internalAttr.equals(OUTPUT_PORT_GUIDS_ATTR)) {
                 RequestContext.get().setRemovedOutputPorts(removedGuids);