diff --git a/mopidy/mpd/handler.py b/mopidy/mpd/handler.py
index d0638889..15a7258e 100644
--- a/mopidy/mpd/handler.py
+++ b/mopidy/mpd/handler.py
@@ -530,7 +530,7 @@ class MpdHandler(object):
         """The original MPD server returns ``OK`` on an empty request.``"""
         pass
 
-    @handle_pattern(r'^count "(?P<tag>[^"]+)" "(?P<needle>[^"]+)"$')
+    @handle_pattern(r'^count "(?P<tag>[^"]+)" "(?P<needle>[^"]*)"$')
     def _music_db_count(self, tag, needle):
         """
         *musicpd.org, music database section:*