diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 7385a7cd..ea03d4bb 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -483,7 +483,7 @@ class BasePlaybackController(object):
         if self.consume:
             self.backend.current_playlist.remove(original_track)
 
-        if self.random:
+        if self.random and self.current_track in self._shuffled:
             self._shuffled.remove(self.current_track)
 
     def _next(self, track):