diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index 9263838ffa..6a1f0191c4 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -869,7 +869,7 @@ export class EntityService {
           return findEntityObservable.pipe(
             mergeMap((entity) => {
               const tasks: Observable<any>[] = [];
-              const result: Device | Asset = entity as (Device | Asset);
+              const result: Device & Asset = entity as (Device | Asset);
               const additionalInfo = result.additionalInfo || {};
               if (result.label !== entityData.label ||
                  result.type !== entityData.type ||
@@ -882,6 +882,9 @@ export class EntityService {
                 if (result.id.entityType === EntityType.DEVICE) {
                   result.additionalInfo.gateway = entityData.gateway;
                 }
+                if (result.id.entityType === EntityType.DEVICE && result.deviceProfileId) {
+                  delete result.deviceProfileId;
+                }
                 switch (result.id.entityType) {
                   case EntityType.DEVICE:
                     tasks.push(this.deviceService.saveDevice(result, config));