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 393851eb02..76872f731d 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
@@ -640,6 +640,9 @@ public class CalculatedFieldCtx implements Closeable {
                 // if the rules have any changes not tracked by hasStateChanges
                 return true;
             }
+            if (!thisConfig.propagationSettingsEqual(otherConfig)) {
+                return true;
+            }
         }
         if (scheduledUpdateIntervalMillis != other.scheduledUpdateIntervalMillis) {
             return true;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
index d36ba33849..6f3cdbdd3c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
@@ -87,4 +87,11 @@ public class AlarmCalculatedFieldConfiguration implements ArgumentsBasedCalculat
         });
     }
 
+    public boolean propagationSettingsEqual(AlarmCalculatedFieldConfiguration other) {
+        return this.propagate == other.propagate &&
+               this.propagateToOwner == other.propagateToOwner &&
+               this.propagateToTenant == other.propagateToTenant &&
+               Objects.equals(this.propagateRelationTypes, other.propagateRelationTypes);
+    }
+
 }