diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
index 98e7d5aa3e..791abc8cf7 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
@@ -42,7 +42,8 @@ public class DeviceUpdateMsgConstructor {
             builder.setLabel(device.getLabel());
         }
         if (msgType.equals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE) ||
-                msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE)) {
+                msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE) ||
+                msgType.equals(UpdateMsgType.DEVICE_CONFLICT_RPC_MESSAGE)) {
             DeviceCredentials deviceCredentials
                     = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), device.getId());
             if (deviceCredentials != null) {