diff --git a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
index 1a0f2ddd9a..f7fc204c0f 100644
--- a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
@@ -197,8 +197,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                     processTelemetry(ctx, proto, cfIdList, callback);
                 } else if (proto.getAttrDataCount() > 0) {
                     processAttributes(ctx, proto, cfIdList, callback);
-                }
-                if (proto.getRemovedTsKeysCount() > 0) {
+                } else if (proto.getRemovedTsKeysCount() > 0) {
                     processRemovedTelemetry(ctx, proto, cfIdList, callback);
                 } else if (proto.getRemovedAttrKeysCount() > 0) {
                     processRemovedAttributes(ctx, proto, cfIdList, callback);