diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
index 577ff80219..80f5964582 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
@@ -100,7 +100,7 @@ public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
         }
 
         long latestTs = getLatestTimestamp();
-        if (useLatestTs && latestTs != -1) {
+        if (useLatestTs && latestTs != DEFAULT_LAST_UPDATE_TS) {
             ObjectNode resultNode = JacksonUtil.newObjectNode();
             resultNode.put("ts", latestTs);
             resultNode.set("values", valuesNode);