diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 973743e5..4dd0271b 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -322,18 +322,12 @@ class BasePlaybackController(object):
         if self.state == self.STOPPED:
             return
 
-        original_cp_track = self.current_cp_track
         if self.cp_track_at_next:
             self.play(self.cp_track_at_next)
         else:
             self.stop()
             self.current_cp_track = None
 
-        # FIXME This should only be applied when reaching end of track, and not
-        # when pressing "next"
-        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)