diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 6c72473ec7..dcb30d323e 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -176,7 +176,7 @@ import { appRouter } from '../appRouter';
                     }
                     // Return to start of track, unless we are already (almost) at the beginning. In the latter case, continue and move
                     // to the previous track, unless we are at the first track so no previous track exists.
-                    if (currentPlayer._currentTime >= 2 || lastPlayerState.NowPlayingItem.IndexNumber == 1 ) {
+                    if (currentPlayer._currentTime >= 2 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
                         playbackManager.seekPercent(0, currentPlayer);
                         // This is done automatically by playbackManager, however, setting this here gives instant visual feedback.
                         // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 66e0d533f6..7a67d9ffb3 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -770,7 +770,7 @@ export default function () {
                     }
                     // Return to start of track, unless we are already (almost) at the beginning. In the latter case, continue and move
                     // to the previous track, unless we are at the first track so no previous track exists.
-                    if (currentPlayer._currentTime >= 2 || lastPlayerState.NowPlayingItem.IndexNumber == 1 ) {
+                    if (currentPlayer._currentTime >= 2 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
                         playbackManager.seekPercent(0, currentPlayer);
                         // This is done automatically by playbackManager, however, setting this here gives instant visual feedback.
                         // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.