diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 6425f5cbea..98141e2a08 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -224,7 +224,7 @@ public class JacksonUtil {
             kvEntry.getLongValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
         } else if (kvEntry.getDataType() == DataType.JSON) {
             if (kvEntry.getJsonValue().isPresent()) {
-                entityNode.set(kvEntry.getKey(), JacksonUtil.valueToTree(kvEntry.getJsonValue().get()));
+                entityNode.set(kvEntry.getKey(), JacksonUtil.toJsonNode(kvEntry.getJsonValue().get()));
             }
         } else {
             entityNode.put(kvEntry.getKey(), kvEntry.getValueAsString());