diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts
index b0a10f9057..53b194090b 100644
--- a/src/common/entity/compute_state_display.ts
+++ b/src/common/entity/compute_state_display.ts
@@ -24,26 +24,47 @@ import { LocalizeFunc } from "../translations/localize";
 import { computeDomain } from "./compute_domain";
 import { supportsFeatureFromAttributes } from "./supports-feature";
 
+export const computeStateDisplaySingleEntity = (
+  localize: LocalizeFunc,
+  stateObj: HassEntity,
+  locale: FrontendLocaleData,
+  entity: EntityRegistryDisplayEntry | undefined,
+  state?: string
+): string =>
+  computeStateDisplayFromEntityAttributes(
+    localize,
+    locale,
+    entity,
+    stateObj.entity_id,
+    stateObj.attributes,
+    state !== undefined ? state : stateObj.state
+  );
+
 export const computeStateDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
   locale: FrontendLocaleData,
   entities: HomeAssistant["entities"],
   state?: string
-): string =>
-  computeStateDisplayFromEntityAttributes(
+): string => {
+  const entity = entities[stateObj.entity_id] as
+    | EntityRegistryDisplayEntry
+    | undefined;
+
+  return computeStateDisplayFromEntityAttributes(
     localize,
     locale,
-    entities,
+    entity,
     stateObj.entity_id,
     stateObj.attributes,
     state !== undefined ? state : stateObj.state
   );
+};
 
 export const computeStateDisplayFromEntityAttributes = (
   localize: LocalizeFunc,
   locale: FrontendLocaleData,
-  entities: HomeAssistant["entities"],
+  entity: EntityRegistryDisplayEntry | undefined,
   entityId: string,
   attributes: any,
   state: string
@@ -52,8 +73,6 @@ export const computeStateDisplayFromEntityAttributes = (
     return localize(`state.default.${state}`);
   }
 
-  const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
-
   // Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
   if (isNumericFromAttributes(attributes)) {
     // state is duration
diff --git a/src/common/translations/blank_before_percent.ts b/src/common/translations/blank_before_percent.ts
index 4c489c96c8..49fece6675 100644
--- a/src/common/translations/blank_before_percent.ts
+++ b/src/common/translations/blank_before_percent.ts
@@ -4,7 +4,7 @@ import { FrontendLocaleData } from "../../data/translation";
 export const blankBeforePercent = (
   localeOptions: FrontendLocaleData
 ): string => {
-  switch (localeOptions.language) {
+  switch (localeOptions?.language) {
     case "cz":
     case "de":
     case "fi":
diff --git a/src/data/history.ts b/src/data/history.ts
index 0bd3bd2e3f..dcc37a45a3 100644
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -291,7 +291,7 @@ const processTimelineEntity = (
       state_localize: computeStateDisplayFromEntityAttributes(
         localize,
         language,
-        entities,
+        entities[entityId],
         entityId,
         {
           ...(state.a || first.a),
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 94d2fd49ed..6f00fc3dfa 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -18,7 +18,7 @@ import { DOMAINS_TOGGLE } from "../../../common/const";
 import { transform } from "../../../common/decorators/transform";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { computeStateDisplay } from "../../../common/entity/compute_state_display";
+import { computeStateDisplaySingleEntity } from "../../../common/entity/compute_state_display";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { stateColorCss } from "../../../common/entity/state_color";
@@ -46,6 +46,7 @@ import { ButtonCardConfig } from "./types";
 import { LocalizeFunc } from "../../../common/translations/localize";
 import { FrontendLocaleData } from "../../../data/translation";
 import { Themes } from "../../../data/ws-themes";
+import { EntityRegistryDisplayEntry } from "../../../data/entity_registry";
 
 @customElement("hui-button-card")
 export class HuiButtonCard extends LitElement implements LovelaceCard {
@@ -90,25 +91,26 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
   })
   _stateObj?: HassEntity;
 
+  @state()
   @consume({ context: themesContext, subscribe: true })
   _themes!: Themes;
 
+  @state()
   @consume({ context: localizeContext, subscribe: true })
   _localize!: LocalizeFunc;
 
+  @state()
   @consume({ context: localeContext, subscribe: true })
   _locale!: FrontendLocaleData;
 
-  @consume({ context: entitiesContext, subscribe: true })
-  @transform<HomeAssistant["entities"], HomeAssistant["entities"]>({
+  @consume<any>({ context: entitiesContext, subscribe: true })
+  @transform<HomeAssistant["entities"], EntityRegistryDisplayEntry>({
     transformer: function (this: HuiButtonCard, value) {
-      return this._config?.entity
-        ? { [this._config?.entity]: value[this._config?.entity] }
-        : {};
+      return this._config?.entity ? value[this._config?.entity] : undefined;
     },
     watch: ["_config"],
   })
-  _entities!: HomeAssistant["entities"];
+  _entity?: EntityRegistryDisplayEntry;
 
   @queryAsync("mwc-ripple") private _ripple!: Promise<Ripple | null>;
 
@@ -150,7 +152,7 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
   }
 
   protected render() {
-    if (!this._config) {
+    if (!this._config || !this._localize || !this._locale) {
       return nothing;
     }
     const stateObj = this._stateObj;
@@ -217,11 +219,11 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
           : ""}
         ${this._config.show_state && stateObj
           ? html`<span class="state">
-              ${computeStateDisplay(
+              ${computeStateDisplaySingleEntity(
                 this._localize,
                 stateObj,
                 this._locale,
-                this._entities
+                this._entity
               )}
             </span>`
           : ""}