diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
index 8f3e0d814b..a881780012 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
@@ -46,7 +46,7 @@ public abstract class Task<R extends TaskResult> {
     public Task() {
     }
 
-    private int attempt = 0;
+    private int attempt;
 
     public abstract R toFailed(Throwable error);
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
index a45fd90838..8cf0bfb618 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
@@ -38,6 +38,7 @@ public class MobileLayoutConfig {
     @Schema(description = "List of pages")
     @JsonView(Views.Public.class)
     @Valid
+    @Builder.Default
     private List<MobilePage> pages = new ArrayList<>();
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index e8dbfd1584..fd13317a38 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -168,16 +168,20 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
 
     private double warnThreshold;
 
+    @Builder.Default
     @Schema(example = "5")
     private long maxCalculatedFieldsPerEntity = 5;
+    @Builder.Default
     @Schema(example = "10")
     private long maxArgumentsPerCF = 10;
     @Builder.Default
     @Min(value = 1, message = "must be at least 1")
     @Schema(example = "1000")
     private long maxDataPointsPerRollingArg = 1000;
+    @Builder.Default
     @Schema(example = "32")
     private long maxStateSizeInKBytes = 32;
+    @Builder.Default
     @Schema(example = "2")
     private long maxSingleValueArgumentSizeInKBytes = 2;