diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java
index 4fff0af083..6e70439943 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java
@@ -71,8 +71,11 @@ public abstract class BaseDataWithAdditionalInfo<I extends UUIDBased> extends Ba
         if (o == null || getClass() != o.getClass()) return false;
         if (!super.equals(o)) return false;
         BaseDataWithAdditionalInfo<?> that = (BaseDataWithAdditionalInfo<?>) o;
-        byte [] additionalInfoBytesForEquals = additionalInfoBytes != null && new String(additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ? null : additionalInfoBytes;
-        return Arrays.equals(additionalInfoBytesForEquals, that.additionalInfoBytes);
+        byte [] additionalInfoBytesForEquals = additionalInfoBytes != null && new String(additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ?
+                null : additionalInfoBytes;
+        byte [] thatAdditionalInfoBytesForEquals = that.additionalInfoBytes != null && new String(that.additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ?
+                null : that.additionalInfoBytes;
+        return Arrays.equals(additionalInfoBytesForEquals, thatAdditionalInfoBytesForEquals);
     }
 
     @Override