diff --git a/mopidy/backends/local/library.py b/mopidy/backends/local/library.py
index 24145e9a..73b4bf50 100644
--- a/mopidy/backends/local/library.py
+++ b/mopidy/backends/local/library.py
@@ -58,7 +58,8 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
                 q = value.strip()
 
                 uri_filter = lambda t: q == t.uri
-                track_filter = lambda t: int(q) == t.track_no
+                track_filter = lambda t: q == int(t.track_no) \
+                    if t.track_no.isdigit() else None
                 album_filter = lambda t: q == getattr(t, 'album', Album()).name
                 artist_filter = lambda t: filter(
                     lambda a: q == a.name, t.artists)