diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java
index 08ee81282f..9f6896392e 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java
@@ -310,7 +310,7 @@ public class CalculatedFieldCtx {
     }
 
     public boolean hasOtherSignificantChanges(CalculatedFieldCtx other) {
-        boolean expressionChanged = !expression.equals(other.expression);
+        boolean expressionChanged = calculatedField.getConfiguration() instanceof ExpressionBasedCalculatedFieldConfiguration && !expression.equals(other.expression);
         boolean outputChanged = !output.equals(other.output);
         return expressionChanged || outputChanged;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/EntityCoordinates.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/EntityCoordinates.java
index 9aed948b76..9ea5c19e8c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/EntityCoordinates.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/EntityCoordinates.java
@@ -17,12 +17,10 @@ package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 
 import lombok.Data;
-import org.springframework.lang.Nullable;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
-import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.Map;