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 a10ae17b88..e91e55bacb 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
@@ -518,7 +518,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
             String payload = hasError ? responseMsg.getError() : responseMsg.getPayload();
             systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(
                     new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(),
-                            payload, hasError ? RpcError.INTERNAL : null));
+                            payload, null));
             if (requestMd.getMsg().getMsg().isPersisted()) {
                 RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL;
                 JsonNode response;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
index c5b8eb21b4..8d9d904368 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
@@ -495,8 +495,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
       const serverAttributes: AttributeData[] = [];
       const sharedAttributes: AttributeData[] = [];
       const telemetry: AttributeData[] = [];
-      for (const key of this.visibleKeys(toSave)) {
-        const currentValue = this.multipleInputFormGroup.get(key.formId).value;
+      for (const key of toSave.keys) {
+        const currentValue = key.settings.dataKeyHidden ? key.value : this.multipleInputFormGroup.get(key.formId).value;
         if (!isEqual(currentValue, key.value) || this.settings.updateAllValues) {
           const attribute: AttributeData = {
             key: key.name,