diff --git a/docs/changes.rst b/docs/changes.rst
index 20ce474a..f6058708 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -26,6 +26,8 @@ We got an updated :doc:`release roadmap <development/roadmap>`!
     command error instead of crashing.
   - ``list`` accepts field argument without quotes and capitalized, to work
     with GMPC and ncmpc.
+  - ``noidle`` command now returns ``OK`` instead of an error. Should make some
+    clients work a bit better.
 
 
 0.1.0a2 (2010-06-02)
diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py
index 2d8c783d..58699a5b 100644
--- a/mopidy/mpd/frontend.py
+++ b/mopidy/mpd/frontend.py
@@ -1248,7 +1248,7 @@ class MpdFrontend(object):
     @handle_pattern(r'^noidle$')
     def _status_noidle(self):
         """See :meth:`_status_idle`."""
-        raise MpdNotImplemented # TODO
+        pass # TODO
 
     @handle_pattern(r'^stats$')
     def _status_stats(self):
diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py
index 5ed4242a..932d6d9a 100644
--- a/tests/mpd/frontend_test.py
+++ b/tests/mpd/frontend_test.py
@@ -146,7 +146,7 @@ class StatusHandlerTest(unittest.TestCase):
 
     def test_noidle(self):
         result = self.h.handle_request(u'noidle')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+        self.assert_(u'OK' in result)
 
     def test_stats_command(self):
         result = self.h.handle_request(u'stats')