diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index 82ebf8bc1fe0..b32c02c6fd31 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -383,8 +383,13 @@ export class HaSelectSelector extends LitElement { return label.toLowerCase().includes(this._filter?.toLowerCase()); }); - if (this._filter && this.selector.select?.custom_value) { - filteredItems?.unshift({ label: this._filter, value: this._filter }); + if ( + this._filter && + this.selector.select?.custom_value && + filteredItems && + !filteredItems.some((item) => (item.label || item.value) === this._filter) + ) { + filteredItems.unshift({ label: this._filter, value: this._filter }); } this.comboBox.filteredItems = filteredItems;