diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 4dd0271b..bb0ab3dc 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -291,15 +291,15 @@ class BasePlaybackController(object):
         if self.cp_track_at_eot:
             self.play(self.cp_track_at_eot)
 
-            if self.consume:
-                self.backend.current_playlist.remove(cpid=original_cp_track[0])
-
             if self.random and self.current_cp_track in self._shuffled:
                 self._shuffled.remove(self.current_cp_track)
         else:
             self.stop()
             self.current_cp_track = None
 
+        if self.consume:
+            self.backend.current_playlist.remove(cpid=original_cp_track[0])
+
     def on_current_playlist_change(self):
         """
         Tell the playback controller that the current playlist has changed.