diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index d2c96fccce..2c74430823 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -197,10 +197,10 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
               disabled: this._shouldDisableOptions(entityId),
               selector: {
                 attribute: {
-                  entity_id: entityId,
                   hide_attributes: ["entity_picture", "friendly_name", "icon"],
                 },
               },
+              context: { filter_entity: "entity" },
             },
             {
               name: "unit",