diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 68d09a39d5..c06d2cd5a9 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -102,6 +102,9 @@ export class HaEntityPicker extends LitElement {
 
   @property({ type: Boolean }) public hideClearIcon = false;
 
+  @property({ attribute: "item-label-path" }) public itemLabelPath =
+    "friendly_name";
+
   @state() private _opened = false;
 
   @query("ha-combo-box", true) public comboBox!: HaComboBox;
@@ -300,7 +303,7 @@ export class HaEntityPicker extends LitElement {
     return html`
       <ha-combo-box
         item-value-path="entity_id"
-        item-label-path="friendly_name"
+        .itemLabelPath=${this.itemLabelPath}
         .hass=${this.hass}
         .value=${this._value}
         .label=${this.label === undefined
diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index d2993647fe..7b8fb28753 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -193,6 +193,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
               value="{{_entityId}}"
               on-change="entityIdChanged"
               allow-custom-entity
+              item-label-path="entity_id"
             ></ha-entity-picker>
             <ha-tip hass="[[hass]]">[[localize('ui.tips.key_e_hint')]]</ha-tip>
             <ha-textfield