diff --git a/addon.xml b/addon.xml
index 4721211..6e61a97 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.embycon" 
         name="EmbyCon"
-        version="1.8.5"
+        version="1.8.6"
         provider-name="Team B">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py
index 7777541..28d2ba6 100644
--- a/resources/lib/widgets.py
+++ b/resources/lib/widgets.py
@@ -73,7 +73,7 @@ def set_background_image(force=False):
                   len(background_items), background_current_item)
         url = ('{server}/emby/Users/{userid}/Items' +
                '?Recursive=true' +
-               '&limit=60' +
+               # '&limit=60' +
                '&SortBy=Random' +
                '&IncludeItemTypes=Movie,Series' +
                '&ImageTypeLimit=1')
diff --git a/service.py b/service.py
index ddc8ed3..79e548f 100644
--- a/service.py
+++ b/service.py
@@ -100,29 +100,37 @@ while not xbmc.abortRequested:
                 sendProgress(monitor)
 
         else:
-            user_changed = False
-            if prev_user_id != home_window.getProperty("userid"):
-                log.debug("user_change_detected")
-                prev_user_id = home_window.getProperty("userid")
-                user_changed = True
+            screen_saver_active = xbmc.getCondVisibility("System.ScreenSaverActive")
 
-            if random_movie_list_interval != 0 and user_changed or (time.time() - last_random_movie_update) > random_movie_list_interval:
-                last_random_movie_update = time.time()
-                set_random_movies()
+            if not screen_saver_active:
+                user_changed = False
+                if prev_user_id != home_window.getProperty("userid"):
+                    log.debug("user_change_detected")
+                    prev_user_id = home_window.getProperty("userid")
+                    user_changed = True
 
-            if newcontent_interval != 0 and user_changed or (time.time() - last_content_check) > newcontent_interval:
-                last_content_check = time.time()
-                checkForNewContent()
+                if random_movie_list_interval != 0 and user_changed or (time.time() - last_random_movie_update) > random_movie_list_interval:
+                    last_random_movie_update = time.time()
+                    set_random_movies()
 
-            if background_interval != 0 and user_changed or (time.time() - last_background_update) > background_interval:
-                last_background_update = time.time()
-                set_library_window_values(user_changed)
-                set_background_image(user_changed)
+                if newcontent_interval != 0 and user_changed or (time.time() - last_content_check) > newcontent_interval:
+                    last_content_check = time.time()
+                    checkForNewContent()
 
-            if remote_control and user_changed:
-                websocket_client.stop_client()
-                websocket_client = WebSocketClient()
-                websocket_client.start()
+                if background_interval != 0 and user_changed or (time.time() - last_background_update) > background_interval:
+                    last_background_update = time.time()
+                    set_library_window_values(user_changed)
+                    set_background_image(user_changed)
+
+                if remote_control and user_changed:
+                    websocket_client.stop_client()
+                    websocket_client = WebSocketClient()
+                    websocket_client.start()
+
+            elif screen_saver_active:
+                if background_interval != 0 and (time.time() - last_background_update) > background_interval:
+                    last_background_update = time.time()
+                    set_background_image(False)
 
     except Exception as error:
         log.error("Exception in Playback Monitor: {0}", error)