diff --git a/resources/lib/WebSocketClient.py b/resources/lib/WebSocketClient.py
index 4274a43a..49890135 100644
--- a/resources/lib/WebSocketClient.py
+++ b/resources/lib/WebSocketClient.py
@@ -302,7 +302,7 @@ class WebSocketThread(threading.Thread):
             self.client.run_forever()
             if(self.keepRunning):
                 self.logMsg("Client Needs To Restart")
-                if self.KodiMonitor.waitForAbort(10000):
+                if self.KodiMonitor.waitForAbort(5):
                     break
             
         self.logMsg("Thread Exited")
diff --git a/service.py b/service.py
index a51f6d01..8b41ab4a 100644
--- a/service.py
+++ b/service.py
@@ -68,7 +68,9 @@ class Service():
         
         while not self.KodiMonitor.abortRequested():
             
-            xbmc.sleep(1000)
+            if self.KodiMonitor.waitForAbort(1):
+                # Abort was requested while waiting. We should exit
+                break
             
             if xbmc.Player().isPlaying():
                 try:
@@ -120,7 +122,9 @@ class Service():
                         if(libSync and countSync):
                             startupComplete = True
                     else:
-                        xbmc.sleep(10000)
+                        if self.KodiMonitor.waitForAbort(10):
+                            # Abort was requested while waiting. We should exit
+                            break                    
                     
                 else:
                     xbmc.log("Not authenticated yet")