diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index c4ef5fbf..1faa5adf 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -149,10 +149,9 @@ class BasePlaybackController(object):
             return cp_tracks[0]
 
         if self.repeat and self.single:
-            return cp_tracks[
-                (self.current_playlist_position) % len(cp_tracks)]
+            return cp_tracks[self.current_playlist_position]
 
-        if self.repeat:
+        if self.repeat and not self.single:
             return cp_tracks[
                 (self.current_playlist_position + 1) % len(cp_tracks)]