diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 4d454bff49..da6a0ccb5c 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -144,10 +144,12 @@ export class MoreInfoDialog extends LitElement {
 
   public closeDialog() {
     this._entityId = undefined;
+    this._parentEntityIds = [];
     this._entry = undefined;
-    this._childView = undefined;
     this._infoEditMode = false;
     this._initialView = DEFAULT_VIEW;
+    this._currView = DEFAULT_VIEW;
+    this._childView = undefined;
     this._isEscapeEnabled = true;
     window.removeEventListener("dialog-closed", this._enableEscapeKeyClose);
     window.removeEventListener("show-dialog", this._disableEscapeKeyClose);
@@ -527,67 +529,69 @@ export class MoreInfoDialog extends LitElement {
                 `
               : nothing}
         </ha-dialog-header>
-        <div
-          class="content"
-          tabindex="-1"
-          dialogInitialFocus
-          @show-child-view=${this._showChildView}
-          @entity-entry-updated=${this._entryUpdated}
-          @toggle-edit-mode=${this._handleToggleInfoEditModeEvent}
-          @hass-more-info=${this._handleMoreInfoEvent}
-        >
-          ${keyed(
-            this._entityId,
-            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"
+        ${keyed(
+          this._entityId,
+          html`
+            <div
+              class="content"
+              tabindex="-1"
+              dialogInitialFocus
+              @show-child-view=${this._showChildView}
+              @entity-entry-updated=${this._entryUpdated}
+              @toggle-edit-mode=${this._handleToggleInfoEditModeEvent}
+              @hass-more-info=${this._handleMoreInfoEvent}
+            >
+              ${cache(
+                this._childView
                   ? html`
-                      <ha-more-info-info
-                        dialogInitialFocus
-                        .hass=${this.hass}
-                        .entityId=${this._entityId}
-                        .entry=${this._entry}
-                        .editMode=${this._infoEditMode}
-                      ></ha-more-info-info>
+                      <div class="child-view">
+                        ${dynamicElement(this._childView.viewTag, {
+                          hass: this.hass,
+                          entry: this._entry,
+                          params: this._childView.viewParams,
+                        })}
+                      </div>
                     `
-                  : this._currView === "history"
+                  : this._currView === "info"
                     ? html`
-                        <ha-more-info-history-and-logbook
+                        <ha-more-info-info
+                          dialogInitialFocus
                           .hass=${this.hass}
                           .entityId=${this._entityId}
-                        ></ha-more-info-history-and-logbook>
+                          .entry=${this._entry}
+                          .editMode=${this._infoEditMode}
+                        ></ha-more-info-info>
                       `
-                    : this._currView === "settings"
+                    : this._currView === "history"
                       ? html`
-                          <ha-more-info-settings
+                          <ha-more-info-history-and-logbook
                             .hass=${this.hass}
                             .entityId=${this._entityId}
-                            .entry=${this._entry}
-                          ></ha-more-info-settings>
+                          ></ha-more-info-history-and-logbook>
                         `
-                      : this._currView === "related"
+                      : this._currView === "settings"
                         ? html`
-                            <ha-related-items
+                            <ha-more-info-settings
                               .hass=${this.hass}
-                              .itemId=${entityId}
-                              .itemType=${SearchableDomains.has(domain)
-                                ? (domain as ItemType)
-                                : "entity"}
-                            ></ha-related-items>
+                              .entityId=${this._entityId}
+                              .entry=${this._entry}
+                            ></ha-more-info-settings>
                           `
-                        : nothing
-            )
-          )}
-        </div>
+                        : this._currView === "related"
+                          ? html`
+                              <ha-related-items
+                                .hass=${this.hass}
+                                .itemId=${entityId}
+                                .itemType=${SearchableDomains.has(domain)
+                                  ? (domain as ItemType)
+                                  : "entity"}
+                              ></ha-related-items>
+                            `
+                          : nothing
+              )}
+            </div>
+          `
+        )}
       </ha-dialog>
     `;
   }