diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py
index 2e7dbab1..40d4a099 100644
--- a/mopidy/backends/spotify/library.py
+++ b/mopidy/backends/spotify/library.py
@@ -56,4 +56,7 @@ class SpotifyLibraryProvider(BaseLibraryProvider):
         logger.debug(u'Spotify search query: %s' % spotify_query)
         queue = Queue.Queue()
         self.backend.spotify.search(spotify_query.encode(ENCODING), queue)
-        return queue.get()
+        try:
+            return queue.get(timeout=3) # XXX What is an reasonable timeout?
+        except Queue.Empty:
+            return Playlist(tracks=[])