diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index f5317ac6..16f41b36 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -390,7 +390,10 @@ class BasePlaybackController(object):
 
     def end_of_track_callback(self):
         """Tell the playback controller that end of track is reached."""
-        self.next()
+        if self.next_track is not None:
+            self.next()
+        else:
+            self.stop()
 
     def new_playlist_loaded_callback(self):
         """Tell the playback controller that a new playlist has been loaded."""