diff --git a/jellyfin_kodi/jellyfin/ws_client.py b/jellyfin_kodi/jellyfin/ws_client.py
index 30f4c831..3d8d0dc2 100644
--- a/jellyfin_kodi/jellyfin/ws_client.py
+++ b/jellyfin_kodi/jellyfin/ws_client.py
@@ -62,7 +62,7 @@ class WSClient(threading.Thread):
 
             self.wsc.run_forever(ping_interval=10)
 
-            if not self.stop and monitor.waitForAbort(5):
+            if monitor.waitForAbort(5):
                 break
 
         LOG.info("---<[ websocket ]")
diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py
index 40e588fb..e3ee07c0 100644
--- a/jellyfin_kodi/views.py
+++ b/jellyfin_kodi/views.py
@@ -853,7 +853,7 @@ class Views(object):
         if not self.server.logged_in:
             window('%s.artwork' % prop, clear=True)
 
-        elif self.server.logged_in and self.media_folders is not None:
+        elif self.media_folders is not None:
             for library in self.media_folders:
 
                 if library['Id'] == view_id and 'Primary' in library.get('ImageTags', {}):