diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 22c0bdbd53..de01367f8b 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -349,7 +349,13 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
           .label=${this.hass.localize("ui.dialogs.entity_registry.editor.icon")}
           .placeholder=${this.entry.original_icon || stateObj?.attributes.icon}
           .fallbackPath=${!this._icon && !stateObj?.attributes.icon && stateObj
-            ? domainIcon(computeDomain(stateObj.entity_id), stateObj)
+            ? domainIcon(computeDomain(stateObj.entity_id), {
+                ...stateObj,
+                attributes: {
+                  ...stateObj.attributes,
+                  device_class: this._deviceClass,
+                },
+              })
             : undefined}
           .disabled=${this._submitting}
         ></ha-icon-picker>