diff --git a/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx b/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx
index bb53bf6ef5..33eefa72b2 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 e68e8fa809..c5f5182cc8 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -852,17 +852,8 @@ export class PlaybackManager {
         self.getTargets = function () {
             const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
 
-            return Promise.all(promises).then(function (responses) {
-                const targets = [];
-
-                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) {