diff --git a/resources/lib/service_entry.py b/resources/lib/service_entry.py
index ca40edfa..3b67a3c0 100644
--- a/resources/lib/service_entry.py
+++ b/resources/lib/service_entry.py
@@ -285,7 +285,7 @@ class Service(object):
                 # Server went offline
                 break
 
-            if self.monitor.waitForAbort(5):
+            if self.monitor.waitForAbort(30):
                 # Abort was requested while waiting. We should exit
                 break
 
diff --git a/resources/lib/websocket_client.py b/resources/lib/websocket_client.py
index f3899b1b..9f9e383e 100644
--- a/resources/lib/websocket_client.py
+++ b/resources/lib/websocket_client.py
@@ -364,7 +364,7 @@ class WebSocketClient(threading.Thread):
             if self._stop_websocket:
                 break
 
-            if self.monitor.waitForAbort(5):
+            if self.monitor.waitForAbort(10):
                 # Abort was requested, exit
                 break