diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
index 44cc111336..7e15d2f692 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -379,10 +379,10 @@ public class EntityRelationController extends BaseController {
 
     private void checkRelation(EntityId from, EntityId to) throws ThingsboardException {
         UUID currentUserTenantId = getCurrentUser().getTenantId().getId();
-        if (from.getEntityType() != EntityType.TENANT || !from.getId().equals(currentUserTenantId)) {
+        if (!(from.getEntityType() == EntityType.TENANT && from.getId().equals(currentUserTenantId))) {
             checkEntityId(from, Operation.WRITE);
         }
-        if (to.getEntityType() != EntityType.TENANT || !to.getId().equals(currentUserTenantId)) {
+        if (!(to.getEntityType() == EntityType.TENANT && to.getId().equals(currentUserTenantId))) {
             checkEntityId(to, Operation.WRITE);
         }
     }