diff --git a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
index 7b5c2e42bb..d67efe1680 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
@@ -156,7 +156,7 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF
         }
         if (result instanceof PropagationCalculatedFieldResult propagationResult) {
             handlePropagationResults(propagationResult, callback,
-                    (entity, res, cb) -> saveTelemetryResult(tenantId, entityId, res, cfIds, cb));
+                    (entity, res, cb) -> saveTelemetryResult(tenantId, entity, res, cfIds, cb));
             return;
         }
         callback.onSuccess();
@@ -165,7 +165,7 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF
     private void pushMsgToRuleEngine(TenantId tenantId, EntityId entityId, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
         if (result instanceof PropagationCalculatedFieldResult propagationResult) {
             handlePropagationResults(propagationResult, callback,
-                    (entity, res, cb) -> sendMsgToRuleEngine(tenantId, entityId, cb, res.toTbMsg(entity, cfIds)));
+                    (entity, res, cb) -> sendMsgToRuleEngine(tenantId, entity, cb, res.toTbMsg(entity, cfIds)));
             return;
         }
 
diff --git a/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java b/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
index 1d535a96c2..af0c1b9909 100644
--- a/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
@@ -1099,7 +1099,9 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
         arg.setRefEntityKey(new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null));
         cfg.setArguments(Map.of("temperatureComputed", arg));
 
-        cfg.setOutput(new TimeSeriesOutput());
+        TimeSeriesOutput output = new TimeSeriesOutput();
+        output.setStrategy(new TimeSeriesImmediateOutputStrategy(0, true, true, true, true));
+        cfg.setOutput(output);
 
         cf.setConfiguration(cfg);