diff --git a/src/panels/media-browser/ha-panel-media-browser.ts b/src/panels/media-browser/ha-panel-media-browser.ts
index c12d5d65da..086487bb81 100644
--- a/src/panels/media-browser/ha-panel-media-browser.ts
+++ b/src/panels/media-browser/ha-panel-media-browser.ts
@@ -191,6 +191,14 @@ class PanelMediaBrowser extends LitElement {
   public willUpdate(changedProps: PropertyValues): void {
     super.willUpdate(changedProps);
 
+    if (
+      !this.hasUpdated &&
+      this._entityId !== BROWSER_PLAYER &&
+      !(this._entityId in this.hass.states)
+    ) {
+      this._entityId = BROWSER_PLAYER;
+    }
+
     if (!changedProps.has("route")) {
       return;
     }