diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts
index 6b0bba5572..a87316e874 100644
--- a/src/dialogs/more-info/controls/more-info-light.ts
+++ b/src/dialogs/more-info/controls/more-info-light.ts
@@ -105,12 +105,12 @@ class MoreInfoLight extends LitElement {
? html`
`;
diff --git a/src/dialogs/more-info/ha-more-info-tab-history.ts b/src/dialogs/more-info/ha-more-info-tab-history.ts
index 18624a11ef..eeb00cef33 100644
--- a/src/dialogs/more-info/ha-more-info-tab-history.ts
+++ b/src/dialogs/more-info/ha-more-info-tab-history.ts
@@ -85,7 +85,18 @@ export class MoreInfoTabHistoryDialog extends LitElement {
clearInterval(this._historyRefreshInterval);
}
- if (changedProps.has("entityId")) {
+ if (!this.hass) {
+ return;
+ }
+
+ const oldHass = changedProps.get("hass") as HomeAssistant;
+ const newStateObj = this.hass.states[this.entityId];
+ const oldStateObj = oldHass?.states[this.entityId];
+
+ if (
+ changedProps.has("entityId") ||
+ (oldHass && newStateObj !== oldStateObj)
+ ) {
this._stateHistory = undefined;
this._entries = undefined;