diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 748d51d1c0..080d10cb1e 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -411,54 +411,54 @@ export class MoreInfoDialog extends LitElement {
           @entity-entry-updated=${this._entryUpdated}
           @toggle-edit-mode=${this._handleToggleInfoEditModeEvent}
         >
-          ${this._childView
-            ? html`
-                <div class="child-view">
-                  ${dynamicElement(this._childView.viewTag, {
-                    hass: this.hass,
-                    entry: this._entry,
-                    params: this._childView.viewParams,
-                  })}
-                </div>
-              `
-            : cache(
-                this._currView === "info"
-                  ? html`
-                      <ha-more-info-info
-                        dialogInitialFocus
-                        .hass=${this.hass}
-                        .entityId=${this._entityId}
-                        .entry=${this._entry}
-                        .editMode=${this._infoEditMode}
-                      ></ha-more-info-info>
-                    `
-                  : this._currView === "history"
-                  ? html`
-                      <ha-more-info-history-and-logbook
-                        .hass=${this.hass}
-                        .entityId=${this._entityId}
-                      ></ha-more-info-history-and-logbook>
-                    `
-                  : this._currView === "settings"
-                  ? html`
-                      <ha-more-info-settings
-                        .hass=${this.hass}
-                        .entityId=${this._entityId}
-                        .entry=${this._entry}
-                      ></ha-more-info-settings>
-                    `
-                  : this._currView === "related"
-                  ? html`
-                      <ha-related-items
-                        .hass=${this.hass}
-                        .itemId=${entityId}
-                        .itemType=${SearchableDomains.has(domain)
-                          ? domain
-                          : "entity"}
-                      ></ha-related-items>
-                    `
-                  : nothing
-              )}
+          ${cache(
+            this._childView
+              ? html`
+                  <div class="child-view">
+                    ${dynamicElement(this._childView.viewTag, {
+                      hass: this.hass,
+                      entry: this._entry,
+                      params: this._childView.viewParams,
+                    })}
+                  </div>
+                `
+              : this._currView === "info"
+              ? html`
+                  <ha-more-info-info
+                    dialogInitialFocus
+                    .hass=${this.hass}
+                    .entityId=${this._entityId}
+                    .entry=${this._entry}
+                    .editMode=${this._infoEditMode}
+                  ></ha-more-info-info>
+                `
+              : this._currView === "history"
+              ? html`
+                  <ha-more-info-history-and-logbook
+                    .hass=${this.hass}
+                    .entityId=${this._entityId}
+                  ></ha-more-info-history-and-logbook>
+                `
+              : this._currView === "settings"
+              ? html`
+                  <ha-more-info-settings
+                    .hass=${this.hass}
+                    .entityId=${this._entityId}
+                    .entry=${this._entry}
+                  ></ha-more-info-settings>
+                `
+              : this._currView === "related"
+              ? html`
+                  <ha-related-items
+                    .hass=${this.hass}
+                    .itemId=${entityId}
+                    .itemType=${SearchableDomains.has(domain)
+                      ? domain
+                      : "entity"}
+                  ></ha-related-items>
+                `
+              : nothing
+          )}
         </div>
       </ha-dialog>
     `;
diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts
index 940ea5de59..593a6d417f 100644
--- a/src/panels/config/entities/entity-registry-settings-editor.ts
+++ b/src/panels/config/entities/entity-registry-settings-editor.ts
@@ -186,7 +186,10 @@ export class EntityRegistrySettingsEditor extends LitElement {
 
   protected willUpdate(changedProperties: PropertyValues) {
     super.willUpdate(changedProperties);
-    if (!changedProperties.has("entry")) {
+    if (
+      !changedProperties.has("entry") ||
+      changedProperties.get("entry")?.id === this.entry.id
+    ) {
       return;
     }