diff --git a/src/panels/lovelace/heading-badges/hui-entity-heading-badge.ts b/src/panels/lovelace/heading-badges/hui-entity-heading-badge.ts
index 4109e08528..e427d104d9 100644
--- a/src/panels/lovelace/heading-badges/hui-entity-heading-badge.ts
+++ b/src/panels/lovelace/heading-badges/hui-entity-heading-badge.ts
@@ -152,6 +152,7 @@ export class HuiEntityHeadingBadge
                 .stateObj=${stateObj}
                 .content=${config.state_content}
                 .name=${config.name}
+                dash-unavailable
               ></state-display>
             `
           : nothing}
diff --git a/src/state-display/state-display.ts b/src/state-display/state-display.ts
index 26bfdbb5cd..a6f12693dd 100644
--- a/src/state-display/state-display.ts
+++ b/src/state-display/state-display.ts
@@ -57,6 +57,9 @@ class StateDisplay extends LitElement {
 
   @property({ attribute: false }) public name?: string;
 
+  @property({ type: Boolean, attribute: "dash-unavailable" })
+  public dashUnavailable?: boolean;
+
   protected createRenderRoot() {
     return this;
   }
@@ -73,6 +76,9 @@ class StateDisplay extends LitElement {
     const domain = computeStateDomain(stateObj);
 
     if (content === "state") {
+      if (this.dashUnavailable && isUnavailableState(stateObj.state)) {
+        return "—";
+      }
       if (
         (stateObj.attributes.device_class === SENSOR_DEVICE_CLASS_TIMESTAMP ||
           TIMESTAMP_STATE_DOMAINS.includes(domain)) &&