diff --git a/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx b/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx
index bb53bf6ef50..33eefa72b2d 100644
--- a/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx
+++ b/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx
@@ -65,17 +65,20 @@ const RemotePlayMenu: FC<RemotePlayMenuProps> = ({
             open={open}
             onClose={onMenuClose}
         >
-            {!isChromecastPluginLoaded && ([
-                <MenuItem key='cast-unsupported-item' disabled>
+            {!isChromecastPluginLoaded && (
+                <MenuItem disabled>
                     <ListItemIcon>
                         <Warning />
                     </ListItemIcon>
                     <ListItemText>
                         {globalize.translate('GoogleCastUnsupported')}
                     </ListItemText>
-                </MenuItem>,
-                <Divider key='cast-unsupported-divider' />
-            ])}
+                </MenuItem>
+            )}
+
+            {!isChromecastPluginLoaded && playbackTargets.length > 0 && (
+                <Divider />
+            )}
 
             {playbackTargets.map(target => (
                 <MenuItem
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 86acdff7a69..c5f5182cc89 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -852,31 +852,8 @@ export class PlaybackManager {
         self.getTargets = function () {
             const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
 
-            return Promise.all(promises).then(function (responses) {
-                return ServerConnections.currentApiClient().getCurrentUser().then(function (user) {
-                    const targets = [];
-
-                    targets.push({
-                        name: globalize.translate('HeaderMyDevice'),
-                        id: 'localplayer',
-                        playerName: 'localplayer',
-                        playableMediaTypes: ['Audio', 'Video', 'Photo', 'Book'],
-                        isLocalPlayer: true,
-                        supportedCommands: self.getSupportedCommands({
-                            isLocalPlayer: true
-                        }),
-                        user: user
-                    });
-
-                    for (const subTargets of responses) {
-                        for (const subTarget of subTargets) {
-                            targets.push(subTarget);
-                        }
-                    }
-
-                    return targets.sort(sortPlayerTargets);
-                });
-            });
+            return Promise.all(promises)
+                .then(responses => responses.flat().sort(sortPlayerTargets));
         };
 
         self.playerHasSecondarySubtitleSupport = function (player = self._currentPlayer) {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 096b71c8fc1..bf15e1c0d86 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -451,7 +451,6 @@
     "HeaderMetadataSettings": "Metadata Settings",
     "HeaderMoreLikeThis": "More Like This",
     "HeaderMusicQuality": "Music Quality",
-    "HeaderMyDevice": "My Device",
     "HeaderMyMedia": "My Media",
     "HeaderMyMediaSmall": "My Media (small)",
     "HeaderNavigation": "Navigation",