diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py
index a8a9bcd6..96e5f616 100644
--- a/mopidy/backends/spotify/library.py
+++ b/mopidy/backends/spotify/library.py
@@ -163,7 +163,9 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
                     translator.to_mopidy_track(t) for t in results.tracks()])
             future.set(search_result)
 
-        if not self.backend.spotify.connected.wait(settings.SPOTIFY_TIMEOUT):
+        # Wait always returns None on python 2.6 :/
+        self.backend.spotify.connected.wait(settings.SPOTIFY_TIMEOUT)
+        if not self.backend.spotify.connected.is_set():
             logger.debug('Not connected: Spotify search cancelled')
             return SearchResult(uri='spotify:search')
 
diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py
index 0eed9939..ad0a806e 100644
--- a/mopidy/backends/spotify/session_manager.py
+++ b/mopidy/backends/spotify/session_manager.py
@@ -84,6 +84,7 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager):
     def logged_out(self, session):
         """Callback used by pyspotify"""
         logger.info('Disconnected from Spotify')
+        self.connected.clear()
 
     def metadata_updated(self, session):
         """Callback used by pyspotify"""