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 ba4be6ace6..8289e4db42 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
@@ -128,6 +128,9 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
     private void checkEntityAndPushToQueue(TenantId tenantId, EntityId entityId,
                                            Predicate<CalculatedFieldCtx> mainEntityFilter, Predicate<CalculatedFieldCtx> linkedEntityFilter,
                                            Supplier<ToCalculatedFieldMsg> msg, FutureCallback<Void> callback) {
+        if (EntityType.TENANT.equals(entityId.getEntityType())) {
+            tenantId = (TenantId) entityId;
+        }
         boolean send = checkEntityForCalculatedFields(tenantId, entityId, mainEntityFilter, linkedEntityFilter);
         if (send) {
             clusterService.pushMsgToCalculatedFields(tenantId, entityId, msg.get(), wrap(callback));
@@ -221,6 +224,10 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
     private CalculatedFieldTelemetryMsgProto.Builder buildTelemetryMsgProto(TenantId tenantId, EntityId entityId, List<CalculatedFieldId> calculatedFieldIds, UUID tbMsgId, TbMsgType tbMsgType) {
         CalculatedFieldTelemetryMsgProto.Builder telemetryMsg = CalculatedFieldTelemetryMsgProto.newBuilder();
 
+        if (EntityType.TENANT.equals(entityId.getEntityType())) {
+            tenantId = (TenantId) entityId;
+        }
+
         telemetryMsg.setTenantIdMSB(tenantId.getId().getMostSignificantBits());
         telemetryMsg.setTenantIdLSB(tenantId.getId().getLeastSignificantBits());