diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index 9b658fba..401d5ccc 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -117,13 +117,15 @@ class BasePlaybackController(object): self.stop() def next(self): + current_track = self.current_track + if not self.next_track: self.stop() else: self.play(self.next_track) if self.consume: - self.backend.current_playlist.remove(self.current_track) + self.backend.current_playlist.remove(current_track) def previous(self): if self.previous_track: