diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 9d5d5731..d65de12a 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -452,6 +452,7 @@ class BasePlaybackController(object):
             self.next()
         else:
             self.stop()
+            self.current_track = None
 
     def new_playlist_loaded_callback(self):
         """Tell the playback controller that a new playlist has been loaded."""
diff --git a/tests/backends/base.py b/tests/backends/base.py
index 270c47a1..d7775e0a 100644
--- a/tests/backends/base.py
+++ b/tests/backends/base.py
@@ -274,6 +274,7 @@ class BasePlaybackControllerTest(object):
         self.playback.play(self.tracks[-1])
         self.playback.seek(self.tracks[0].length - 10)
         time.sleep(0.1)
+        self.assertEqual(self.playback.state, self.playback.STOPPED)
         self.assertEqual(self.playback.current_track, None)
 
     @populate_playlist