diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java
index 02332eb307..1506e2f4e8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java
@@ -77,7 +77,7 @@ public class DeviceMsgConstructor {
                     .setCredentialsId(deviceCredentials.getCredentialsId());
         }
         if (deviceCredentials.getCredentialsValue() != null) {
-            builder.setCredentialsValue(deviceCredentials.getCredentialsValue());
+            builder.setCredentialsValue(getStringValue(deviceCredentials.getCredentialsValue()));
         }
         return builder.build();
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java
index b59f192d97..c036eebc16 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java
@@ -144,7 +144,9 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor {
                     DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, device.getId());
                     deviceCredentials.setCredentialsType(DeviceCredentialsType.valueOf(deviceCredentialsUpdateMsg.getCredentialsType()));
                     deviceCredentials.setCredentialsId(deviceCredentialsUpdateMsg.getCredentialsId());
-                    deviceCredentials.setCredentialsValue(deviceCredentialsUpdateMsg.getCredentialsValue());
+                    if (deviceCredentialsUpdateMsg.hasCredentialsValue()) {
+                        deviceCredentials.setCredentialsValue(deviceCredentialsUpdateMsg.getCredentialsValue().getValue());
+                    }
                     deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
                 } catch (Exception e) {
                     log.error("Can't update device credentials for device [{}], deviceCredentialsUpdateMsg [{}]", device.getName(), deviceCredentialsUpdateMsg, e);
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index af041151c6..06eec3c2ce 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -219,7 +219,7 @@ message DeviceCredentialsUpdateMsg {
   int64 deviceIdLSB = 2;
   string credentialsType = 3;
   string credentialsId = 4;
-  string credentialsValue = 5;
+  google.protobuf.StringValue credentialsValue = 5;
 }
 
 message AssetUpdateMsg {