diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts
index e7efb31ae9..eaa62ff761 100644
--- a/src/components/entity/ha-entity-attribute-picker.ts
+++ b/src/components/entity/ha-entity-attribute-picker.ts
@@ -2,15 +2,19 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { LitElement, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { computeAttributeNameDisplay } from "../../common/entity/compute_attribute_display";
+import { ensureArray } from "../../common/array/ensure-array";
+import { fireEvent } from "../../common/dom/fire_event";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-combo-box";
 import type { HaComboBox } from "../ha-combo-box";
-import { ensureArray } from "../../common/array/ensure-array";
-import { fireEvent } from "../../common/dom/fire_event";
 
 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
 
+interface AttributeOption {
+  value: string;
+  label: string;
+}
+
 @customElement("ha-entity-attribute-picker")
 class HaEntityAttributePicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -56,26 +60,29 @@ class HaEntityAttributePicker extends LitElement {
       changedProps.has("attribute")
     ) {
       const entityIds = this.entityId ? ensureArray(this.entityId) : [];
-      const options: { value: string; label: string }[] = [];
-      const attributesSet = new Set<string>();
-
-      for (const entityId of entityIds) {
+      const entitiesOptions = entityIds.map<AttributeOption[]>((entityId) => {
         const stateObj = this.hass.states[entityId];
+        if (!stateObj) {
+          return [];
+        }
+
         const attributes = Object.keys(stateObj.attributes).filter(
           (a) => !this.hideAttributes?.includes(a)
         );
-        for (const a of attributes) {
-          if (!attributesSet.has(a)) {
-            attributesSet.add(a);
-            options.push({
-              value: a,
-              label: computeAttributeNameDisplay(
-                this.hass.localize,
-                stateObj,
-                this.hass.entities,
-                a
-              ),
-            });
+
+        return attributes.map((a) => ({
+          value: a,
+          label: this.hass.formatEntityAttributeName(stateObj, a),
+        }));
+      });
+
+      const options: AttributeOption[] = [];
+      const optionsSet = new Set<string>();
+      for (const entityOptions of entitiesOptions) {
+        for (const option of entityOptions) {
+          if (!optionsSet.has(option.value)) {
+            optionsSet.add(option.value);
+            options.push(option);
           }
         }
       }
diff --git a/src/components/entity/ha-entity-state-picker.ts b/src/components/entity/ha-entity-state-picker.ts
index bdd8f8d7cf..9cd3b05f7a 100644
--- a/src/components/entity/ha-entity-state-picker.ts
+++ b/src/components/entity/ha-entity-state-picker.ts
@@ -91,10 +91,11 @@ class HaEntityStatePicker extends LitElement {
         }
       }
 
-      (this._comboBox as any).filteredItems = [
-        ...(this.extraOptions ?? []),
-        ...options,
-      ];
+      if (this.extraOptions) {
+        options.unshift(...this.extraOptions);
+      }
+
+      (this._comboBox as any).filteredItems = options;
     }
   }
 
diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts
index e69192f361..bc7f986070 100644
--- a/src/components/ha-service-control.ts
+++ b/src/components/ha-service-control.ts
@@ -244,7 +244,7 @@ export class HaServiceControl extends LitElement {
       ).map(([key, value]) => ({
         key,
         ...value,
-        selector: (value.selector || undefined) as Selector | undefined,
+        selector: value.selector as Selector | undefined,
       }));
 
       const flatFields: Field[] = [];