diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts index e56d902b97..66c7d60ca6 100644 --- a/src/components/ha-form/ha-form-multi_select.ts +++ b/src/components/ha-form/ha-form-multi_select.ts @@ -91,7 +91,11 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { slot="trigger" .label=${this.label} .value=${data - .map((value) => this.schema.options![value] || value) + .map( + (value) => + optionLabel(options.find((v) => optionValue(v) === value)) || + value + ) .join(", ")} .disabled=${this.disabled} tabindex="-1"