diff --git a/src/components/device/ha-devices-picker.ts b/src/components/device/ha-devices-picker.ts index 9ca65e20a5..5b2e0245b9 100644 --- a/src/components/device/ha-devices-picker.ts +++ b/src/components/device/ha-devices-picker.ts @@ -68,7 +68,7 @@ class HaDevicesPicker extends LitElement { .excludeDomains=${this.excludeDomains} .includeDeviceClasses=${this.includeDeviceClasses} .label=${this.pickDeviceLabel} - .required=${this.required} + .required=${this.required && !currentDevices.length} @value-changed=${this._addDevice} > diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts index 75002c51d4..f4c1a24d41 100644 --- a/src/components/entity/ha-entities-picker.ts +++ b/src/components/entity/ha-entities-picker.ts @@ -110,7 +110,7 @@ class HaEntitiesPickerLight extends LitElement { .includeUnitOfMeasurement=${this.includeUnitOfMeasurement} .entityFilter=${this._entityFilter} .label=${this.pickEntityLabel} - .required=${this.required} + .required=${this.required && !currentEntities.length} @value-changed=${this._addEntity} > diff --git a/src/components/ha-areas-picker.ts b/src/components/ha-areas-picker.ts index 24b4e4c2b0..adc8a76c7c 100644 --- a/src/components/ha-areas-picker.ts +++ b/src/components/ha-areas-picker.ts @@ -97,7 +97,7 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) { .entityFilter=${this.entityFilter} .disabled=${this.disabled} .placeholder=${this.placeholder} - .required=${this.required} + .required=${this.required && !currentAreas.length} @value-changed=${this._addArea} > diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index 9804a79004..2f79979e90 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -108,7 +108,7 @@ export class HaSelectSelector extends LitElement { .hass=${this.hass} .label=${this.label} .disabled=${this.disabled} - .required=${this.required} + .required=${this.required && !value.length} .value=${this._filter} .items=${options.filter((item) => !this.value?.includes(item.value))} @filter-changed=${this._filterChanged}