diff --git a/addon.xml b/addon.xml
index c25404b..c9194d5 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.1"
+        version="1.8.2"
         provider-name="Team B">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py
index 107037d..5a6cc7b 100644
--- a/resources/lib/play_utils.py
+++ b/resources/lib/play_utils.py
@@ -1045,8 +1045,12 @@ class PlaybackService(xbmc.Monitor):
 
         if stop_playback:
             player = xbmc.Player()
-            if player.isPlaying():
-                player.stop()
+            if player.isPlayingVideo():
+                log.debug("Screen Saver Activated : isPlayingVideo() = true")
+                play_data = get_playing_data(self.monitor.played_information)
+                if play_data:
+                    log.debug("Screen Saver Activated : this is an EmbyCon item so stop it")
+                    player.stop()
 
         #xbmc.executebuiltin("Dialog.Close(selectdialog, true)")
 
diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py
index 76f6d5b..3ec33b6 100644
--- a/resources/lib/server_detect.py
+++ b/resources/lib/server_detect.py
@@ -73,11 +73,6 @@ def getServerDetails():
 def checkServer(force=False, change_user=False, notify=False):
     log.debug("checkServer Called")
 
-    # stop any plaback
-    player = xbmc.Player()
-    if player.isPlaying():
-        player.stop()
-
     settings = xbmcaddon.Addon()
     server_url = ""
     something_changed = False