diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
index 072be6acf2..a1692aef04 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
@@ -107,7 +107,7 @@ public class EntityExportData<E extends ExportableEntity<? extends EntityId>> {
 
     @JsonIgnore
     public boolean hasCalculatedFields() {
-        return calculatedFields != null;
+        return calculatedFields != null && !calculatedFields.isEmpty();
     }
 
 }