diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index 6e76671272..f1c432a532 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -244,7 +244,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         rpc.setExpirationTime(request.getExpirationTime());
         rpc.setRequest(JacksonUtil.valueToTree(request));
         rpc.setStatus(status);
-        rpc.setAdditionalInfo(JacksonUtil.valueToTree(request.getAdditionalInfo()));
+        rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
         return systemContext.getTbRpcService().save(tenantId, rpc);
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
index 1d0b727e5e..196dd1feb7 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
@@ -95,15 +95,8 @@ public class TbSendRPCRequestNode implements TbNode {
             tmp = msg.getMetaData().getValue(DataConstants.RETRIES);
             Integer retries = !StringUtils.isEmpty(tmp) ? Integer.parseInt(tmp) : null;
 
-            String params;
-            JsonElement paramsEl = json.get("params");
-            if (paramsEl.isJsonPrimitive()) {
-                params = paramsEl.getAsString();
-            } else {
-                params = gson.toJson(paramsEl);
-            }
-
-            String additionalInfo = gson.toJson(json.get(DataConstants.ADDITIONAL_INFO));
+            String params = parseJsonData(json.get("params"));
+            String additionalInfo = parseJsonData(json.get(DataConstants.ADDITIONAL_INFO));
 
             RuleEngineDeviceRpcRequest request = RuleEngineDeviceRpcRequest.builder()
                     .oneway(oneway)
@@ -144,4 +137,8 @@ public class TbSendRPCRequestNode implements TbNode {
         return gson.toJson(json);
     }
 
+    private String parseJsonData(JsonElement paramsEl) {
+        return paramsEl.isJsonPrimitive() ? paramsEl.getAsString() : gson.toJson(paramsEl);
+    }
+
 }