diff --git a/package.json b/package.json
index 58914207a..1b6f78527 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
           "src/components/images/imageLoader.js",
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/playback/mediasession.js",
+          "src/components/playback/remotecontrolautoplay.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
           "src/components/bookPlayer/plugin.js",
diff --git a/src/components/playback/remotecontrolautoplay.js b/src/components/playback/remotecontrolautoplay.js
index 90a872cc6..c0adb57a4 100644
--- a/src/components/playback/remotecontrolautoplay.js
+++ b/src/components/playback/remotecontrolautoplay.js
@@ -1,47 +1,45 @@
-define(['events', 'playbackManager'], function (events, playbackManager) {
-    'use strict';
+import events from 'events';
+import playbackManager from 'playbackManager';
 
-    function transferPlayback(oldPlayer, newPlayer) {
+function transferPlayback(oldPlayer, newPlayer) {
+    const state = playbackManager.getPlayerState(oldPlayer);
+    const item = state.NowPlayingItem;
 
-        var state = playbackManager.getPlayerState(oldPlayer);
-
-        var item = state.NowPlayingItem;
-
-        if (!item) {
-            return;
-        }
-
-        var playState = state.PlayState || {};
-        var resumePositionTicks = playState.PositionTicks || 0;
-
-        playbackManager.stop(oldPlayer).then(function () {
-
-            playbackManager.play({
-                ids: [item.Id],
-                serverId: item.ServerId,
-                startPositionTicks: resumePositionTicks
-
-            }, newPlayer);
-        });
+    if (!item) {
+        return;
     }
 
-    events.on(playbackManager, 'playerchange', function (e, newPlayer, newTarget, oldPlayer) {
+    playbackManager.getPlaylist(oldPlayer).then(playlist => {
+        const playlistIds = playlist.map(x => x.Id);
+        const playState = state.PlayState || {};
+        const resumePositionTicks = playState.PositionTicks || 0;
+        const playlistIndex = playlistIds.indexOf(item.Id) || 0;
 
-        if (!oldPlayer || !newPlayer) {
-            return;
-        }
-
-        if (!oldPlayer.isLocalPlayer) {
-            console.debug('Skipping remote control autoplay because oldPlayer is not a local player');
-            return;
-        }
-
-        if (newPlayer.isLocalPlayer) {
-            console.debug('Skipping remote control autoplay because newPlayer is a local player');
-            return;
-        }
-
-        transferPlayback(oldPlayer, newPlayer);
+        playbackManager.stop(oldPlayer).then(() => {
+            playbackManager.play({
+                ids: playlistIds,
+                serverId: item.ServerId,
+                startPositionTicks: resumePositionTicks,
+                startIndex: playlistIndex
+            }, newPlayer);
+        });
     });
+}
 
+events.on(playbackManager, 'playerchange', (e, newPlayer, newTarget, oldPlayer) => {
+    if (!oldPlayer || !newPlayer) {
+        return;
+    }
+
+    if (!oldPlayer.isLocalPlayer) {
+        console.debug('Skipping remote control autoplay because oldPlayer is not a local player');
+        return;
+    }
+
+    if (newPlayer.isLocalPlayer) {
+        console.debug('Skipping remote control autoplay because newPlayer is a local player');
+        return;
+    }
+
+    transferPlayback(oldPlayer, newPlayer);
 });