diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index b9ec17d6..4e6ff96a 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -87,6 +87,7 @@ class BaseCurrentPlaylistController(object):
     def clear(self):
         """Clear the current playlist."""
         self.backend.playback.stop()
+        self.backend.playback.current_track = None
         self.playlist = Playlist()
 
     def get_by_id(self, id):
diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py
index 58294935..ba3d0fec 100644
--- a/tests/mpd/frontend_test.py
+++ b/tests/mpd/frontend_test.py
@@ -543,6 +543,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
         self.assertEquals(self.b.current_playlist.playlist.length, 5)
         result = self.h.handle_request(u'clear')
         self.assertEquals(self.b.current_playlist.playlist.length, 0)
+        self.assertEquals(self.b.playback.current_track, None)
         self.assert_(u'OK' in result)
 
     def test_delete_songpos(self):