diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 8250d40b..9b658fba 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -117,14 +117,14 @@ class BasePlaybackController(object):
             self.stop()
 
     def next(self):
-        if self.consume:
-            self.backend.current_playlist.remove(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)
+
     def previous(self):
         if self.previous_track:
             self.play(self.previous_track)
diff --git a/tests/backends/basetests.py b/tests/backends/basetests.py
index 82e37ff3..a48d4698 100644
--- a/tests/backends/basetests.py
+++ b/tests/backends/basetests.py
@@ -667,7 +667,7 @@ class BasePlaybackControllerTest(object):
         self.playback.consume = True
         self.playback.play()
         self.playback.next()
-        self.assertEqual(self.playback.current_track, None)
+        self.assertEqual(self.playback.previous_track, None)
 
     def test_play_with_random(self):
         raise NotImplementedError