From f814a52faf82833d8a84672fd86f4719354d296d Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Thu, 18 Dec 2025 17:26:09 +0200
Subject: [PATCH] Fix synchronization between 'profileData' and
 'profileDataBytes' after shortServerId update

---
 .../dao/service/validator/DeviceProfileDataValidator.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index 9fac76704c..28d7d598ab 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -174,6 +174,8 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
                 for (LwM2MBootstrapServerCredential bootstrapServerCredential : lwM2MBootstrapServersConfigurations) {
                     validateLwm2mServersCredentialOfBootstrapForClient(bootstrapServerCredential);
                 }
+                // call setProfileData after validation to ensure 'profileData' and 'profileDataBytes' fields are synchronized and ProtoUtils.toProto is not broken
+                deviceProfile.setProfileData(deviceProfile.getProfileData());
             }
         }