diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index e2ece98e..db0a7906 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -479,6 +479,7 @@ class BasePlaybackController(object):
             self.state = self.PLAYING
         elif self.next_track is None:
             self.stop()
+            self.current_track = None
 
         # FIXME handle in play aswell?
         if self.consume:
diff --git a/tests/backends/base.py b/tests/backends/base.py
index fed57676..465d0495 100644
--- a/tests/backends/base.py
+++ b/tests/backends/base.py
@@ -814,4 +814,3 @@ class BasePlaybackControllerTest(object):
             self.assert_(self.playback.current_track not in played)
             played.append(self.playback.current_track)
             self.playback.next()
-        self.assertEqual(self.playback.next_track, None)