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 6e70439943..88f25a6d6a 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,9 +71,9 @@ 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")) ?
+        byte [] additionalInfoBytesForEquals = additionalInfoBytes == null || "null".equals(new String(additionalInfoBytes, StandardCharsets.UTF_8)) ?
                 null : additionalInfoBytes;
-        byte [] thatAdditionalInfoBytesForEquals = that.additionalInfoBytes != null && new String(that.additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ?
+        byte [] thatAdditionalInfoBytesForEquals = that.additionalInfoBytes == null || "null".equals(new String(that.additionalInfoBytes, StandardCharsets.UTF_8)) ?
                 null : that.additionalInfoBytes;
         return Arrays.equals(additionalInfoBytesForEquals, thatAdditionalInfoBytesForEquals);
     }