diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 66521d60..c4ef5fbf 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -383,6 +383,7 @@ class BasePlaybackController(object):
             self.resume()
 
         if cp_track is not None:
+            self.state = self.STOPPED
             self.current_cp_track = cp_track
             self.state = self.PLAYING
             if not self._play(cp_track[1]):
diff --git a/tests/frontends/mpd/playback_test.py b/tests/frontends/mpd/playback_test.py
index b6e0751e..4e60546d 100644
--- a/tests/frontends/mpd/playback_test.py
+++ b/tests/frontends/mpd/playback_test.py
@@ -288,13 +288,14 @@ class PlaybackControlHandlerTest(unittest.TestCase):
     def test_playid_minus_one_resumes_if_paused(self):
         self.b.current_playlist.append([Track(length=40000)])
         self.b.playback.seek(30000)
+        self.assert_(self.b.playback.time_position >= 30000)
+        self.assertEquals(self.b.playback.PLAYING, self.b.playback.state)
         self.b.playback.pause()
+        self.assertEquals(self.b.playback.PAUSED, self.b.playback.state)
         result = self.h.handle_request(u'playid "-1"')
         self.assert_(u'OK' in result)
         self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
         self.assert_(self.b.playback.time_position >= 30000)
-        self.fail(u'This test should fail, but it does not. '
-            'The functionality is not implemented.')
 
     def test_playid_which_does_not_exist(self):
         self.b.current_playlist.append([Track()])