diff --git a/src/panels/config/devices/ha-devices-data-table.ts b/src/panels/config/devices/ha-devices-data-table.ts
index 3ae4037320..fbed2b5365 100644
--- a/src/panels/config/devices/ha-devices-data-table.ts
+++ b/src/panels/config/devices/ha-devices-data-table.ts
@@ -145,7 +145,7 @@ export class HaDevicesDataTable extends LitElement {
                 return html`
                   ${name}<br />
                   ${device.area} | ${device.integration}<br />
-                  ${battery
+                  ${battery && !isNaN(battery.state as any)
                     ? html`
                         ${battery.state}%
                         <ha-state-icon
@@ -205,7 +205,7 @@ export class HaDevicesDataTable extends LitElement {
                 const battery = batteryEntity
                   ? this.hass.states[batteryEntity]
                   : undefined;
-                return battery
+                return battery && !isNaN(battery.state as any)
                   ? html`
                       ${battery.state}%
                       <ha-state-icon
diff --git a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts
index e415f717c9..ec63c369ec 100644
--- a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts
@@ -62,7 +62,8 @@ class HuiSensorEntityRow extends LitElement implements EntityRow {
       <hui-generic-entity-row .hass="${this.hass}" .config="${this._config}">
         <div>
           ${stateObj.attributes.device_class === "timestamp" &&
-          stateObj.state !== "unavailable"
+          stateObj.state !== "unavailable" &&
+          stateObj.state !== "unknown"
             ? html`
                 <hui-timestamp-display
                   .hass="${this.hass}"