diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts
index 605e3210f5..772d0ea29d 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`
                     <div class="segmentationContainer">
                       <ha-color-picker
-                        throttle="500"
                         class="color"
+                        @colorselected=${this._colorPicked}
                         .desiredHsColor=${this._colorPickerColor}
+                        throttle="500"
                         .hueSegments=${this._hueSegments}
                         .saturationSegments=${this._saturationSegments}
-                        @colorselected=${this._colorPicked}
                       >
                       </ha-color-picker>
                       <ha-icon-button
@@ -147,7 +147,7 @@ class MoreInfoLight extends LitElement {
           : ""}
         <ha-attributes
           .stateObj=${this.stateObj}
-          .extraFilters=${"brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,xy_color,min_mireds,max_mireds,entity_id"}
+          extra-filters="brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,xy_color,min_mireds,max_mireds,entity_id"
         ></ha-attributes>
       </div>
     `;
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 eeb00cef33..18624a11ef 100644
--- a/src/dialogs/more-info/ha-more-info-tab-history.ts
+++ b/src/dialogs/more-info/ha-more-info-tab-history.ts
@@ -85,18 +85,7 @@ export class MoreInfoTabHistoryDialog extends LitElement {
       clearInterval(this._historyRefreshInterval);
     }
 
-    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)
-    ) {
+    if (changedProps.has("entityId")) {
       this._stateHistory = undefined;
       this._entries = undefined;