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 a9ae6d7edf..d1278b271b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -382,7 +382,8 @@ public class EntityRelationController extends BaseController {
 
     private void checkCanCreateRelation(EntityId entityId) throws ThingsboardException {
         SecurityUser currentUser = getCurrentUser();
-        if (!(currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId))) {
+        var isTenantAdminAndRelateToSelf = currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId);
+        if (!isTenantAdminAndRelateToSelf) {
             checkEntityId(entityId, Operation.WRITE);
         }
     }