diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js
index 5a07b219d8..073f891c30 100644
--- a/src/components/themeMediaPlayer.js
+++ b/src/components/themeMediaPlayer.js
@@ -22,6 +22,13 @@ function playThemeMedia(items, ownerId) {
             return i.Id;
         });
 
+        currentThemeItems.forEach((i) => {
+            i.playOptions = {
+                fullscreen: false,
+                enableRemotePlayers: false
+            };
+        });
+
         playbackManager.play({
             items: currentThemeItems,
             fullscreen: false,
@@ -65,12 +72,12 @@ function loadThemeMedia(item) {
 
     const apiClient = ServerConnections.getApiClient(item.ServerId);
     apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
-        const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;
+        const result = userSettings.enableThemeVideos() && themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult : themeMediaResult.ThemeSongsResult;
+
+        const ownerId = result.OwnerId;
 
         if (ownerId !== currentOwnerId) {
-            const items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items;
-
-            playThemeMedia(items, ownerId);
+            playThemeMedia(result.Items, ownerId);
         }
     });
 }