diff --git a/src/components/playback/displayMirrorManager.ts b/src/components/playback/displayMirrorManager.ts
index 893953df62..a8a7b1b7a1 100644
--- a/src/components/playback/displayMirrorManager.ts
+++ b/src/components/playback/displayMirrorManager.ts
@@ -33,9 +33,8 @@ async function mirrorIfEnabled(serverId: string, itemId: string) {
 }
 
 document.addEventListener('viewshow', e => {
-    if (e.detail?.params?.id && e.detail?.params?.serverId) {
-        const { serverId, id } = e.detail.params;
-
+    const { serverId, id } = e.detail?.params || {};
+    if (serverId && id) {
         void mirrorIfEnabled(serverId, id);
     }
 });
diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js
index 798ba51511..87d86b7a4b 100644
--- a/src/components/themeMediaPlayer.js
+++ b/src/components/themeMediaPlayer.js
@@ -91,7 +91,7 @@ async function loadThemeMedia(serverId, itemId) {
             return;
         }
 
-        if (excludeTypes.indexOf(item.Type) !== -1) {
+        if (excludeTypes.includes(item.Type)) {
             stopIfPlaying();
             return;
         }
@@ -110,8 +110,8 @@ async function loadThemeMedia(serverId, itemId) {
 }
 
 document.addEventListener('viewshow', e => {
-    if (e.detail?.params?.id && e.detail?.params?.serverId) {
-        const { serverId, id } = e.detail.params;
+    const { serverId, id } = e.detail?.params || {};
+    if (serverId && id) {
         void loadThemeMedia(serverId, id);
         return;
     }