diff --git a/mopidy/mpd/handler.py b/mopidy/mpd/handler.py
index b5cc499e..264bf747 100644
--- a/mopidy/mpd/handler.py
+++ b/mopidy/mpd/handler.py
@@ -66,7 +66,7 @@ class MpdHandler(object):
                 response.append(u'%s: %s' % (key, value))
             else:
                 response.append(line)
-        if add_ok:
+        if add_ok and (not response or not response[-1].startswith(u'ACK')):
             response.append(u'OK')
         return response
 
@@ -109,6 +109,8 @@ class MpdHandler(object):
             response = self.handle_request(command, add_ok=False)
             if response is not None:
                 result.append(response)
+            if response and response[-1].startswith(u'ACK'):
+                return result
             if command_list_ok:
                 response.append(u'list_OK')
         return result
@@ -150,7 +152,12 @@ class MpdHandler(object):
 
     @register(r'^deleteid "(?P<songid>\d+)"$')
     def _deleteid(self, songid):
-        raise MpdNotImplemented # TODO
+        songid = int(songid)
+        try:
+            track = self.backend.current_playlist.get_by_id(songid)
+            return self.backend.current_playlist.remove(track)
+        except KeyError, e:
+            raise MpdAckError(unicode(e))
 
     @register(r'^disableoutput "(?P<outputid>\d+)"$')
     def _disableoutput(self, outputid):
diff --git a/mopidy/mpd/session.py b/mopidy/mpd/session.py
index edd2a95c..c85ed3a0 100644
--- a/mopidy/mpd/session.py
+++ b/mopidy/mpd/session.py
@@ -48,7 +48,8 @@ class MpdSession(asynchat.async_chat):
     def handle_request(self, input):
         try:
             response = self.handler.handle_request(input)
-            self.handle_response(response)
+            if response is not None:
+                self.handle_response(response)
         except MpdAckError, e:
             logger.warning(e)
             return self.send_response(u'ACK %s' % e)