diff --git a/platform/entanglement/src/services/LinkService.js b/platform/entanglement/src/services/LinkService.js
index 465a07f3de..40d809ebcb 100644
--- a/platform/entanglement/src/services/LinkService.js
+++ b/platform/entanglement/src/services/LinkService.js
@@ -39,17 +39,20 @@ define(
         }
 
         LinkService.prototype.validate = function (object, parentCandidate) {
-            var objectId = object.getId();
-            return !!parentCandidate &&
-                !!parentCandidate.getId &&
-                parentCandidate.getId() !== objectId &&
-                parentCandidate.hasCapability("composition") &&
-                parentCandidate.getModel().composition.indexOf(objectId) === -1 &&
-                this.policyService.allow(
-                    "composition",
-                    parentCandidate.getCapability('type'),
-                    object.getCapability('type')
-                );
+            if (!parentCandidate || !parentCandidate.getId) {
+                return false;
+            }
+            if (parentCandidate.getId() === object.getId()) {
+                return false;
+            }
+            if ((parentCandidate.getModel().composition || []).indexOf(object.getId()) !== -1) {
+                return false;
+            }
+            return this.policyService.allow(
+                "composition",
+                parentCandidate.getCapability('type'),
+                object.getCapability('type')
+            ) && parentCandidate.hasCapability('composition');
         };
 
         LinkService.prototype.perform = function (object, parentObject) {