diff --git a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java
index 84f49c7c9e..c7e369a862 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java
@@ -199,7 +199,14 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
                 RelationPathLevel inverseRelation = new RelationPathLevel(inverseDirection, relation.relationType());
                 List<EntityRelation> byRelationPathQuery = relationService.findByRelationPathQuery(tenantId, new EntityRelationPathQuery(entityId, List.of(inverseRelation)));
                 if (!byRelationPathQuery.isEmpty()) {
-                    return true;
+                    EntityId cfEntityId = cfCtx.getEntityId();
+                    for (EntityRelation entityRelation : byRelationPathQuery) {
+                        EntityId relatedId = (inverseDirection == EntitySearchDirection.FROM) ? entityRelation.getTo() : entityRelation.getFrom();
+                        if (cfEntityId.equals(relatedId) || cfEntityId.equals(calculatedFieldCache.getProfileId(tenantId, relatedId))) {
+                            return true;
+                        }
+                    }
+                    return false;
                 }
             }
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java
index 2b3ba19528..34e9dad439 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java
@@ -55,8 +55,6 @@ public interface CalculatedFieldState extends Closeable {
 
     long getLatestTimestamp();
 
-    CalculatedFieldCtx getCtx();
-
     void setCtx(CalculatedFieldCtx ctx, TbActorRef actorCtx);
 
     void init();