diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts
index d051b5f125..c454d339cd 100644
--- a/src/components/ha-selector/ha-selector-select.ts
+++ b/src/components/ha-selector/ha-selector-select.ts
@@ -41,7 +41,7 @@ export class HaSelectSelector extends LitElement {
);
if (!this.selector.select.custom_value && this._mode === "list") {
- if (!this.selector.select.multiple || this.required) {
+ if (!this.selector.select.multiple) {
return html`
${this.label}
@@ -64,7 +64,8 @@ export class HaSelectSelector extends LitElement {
return html`
- ${this.label}${options.map(
+ ${this.label}
+ ${options.map(
(item: SelectOption) => html`
!item.disabled && !this.value?.includes(item.value)
+ (option) => !option.disabled && !value?.includes(option.value)
)}
@filter-changed=${this._filterChanged}
@value-changed=${this._comboBoxValueChanged}
@@ -290,6 +291,9 @@ export class HaSelectSelector extends LitElement {
ha-formfield {
display: block;
}
+ mwc-list-item[disabled] {
+ --mdc-theme-text-primary-on-background: var(--disabled-text-color);
+ }
`;
}