diff --git a/monkey/infection_monkey/transport/http.py b/monkey/infection_monkey/transport/http.py
index 5afb5c2d8..49272481f 100644
--- a/monkey/infection_monkey/transport/http.py
+++ b/monkey/infection_monkey/transport/http.py
@@ -227,6 +227,6 @@ class LockedHTTPServer(threading.Thread):
 class HTTPConnectProxy(TransportProxyBase):
     def run(self):
         httpd = http.server.HTTPServer((self.local_host, self.local_port), HTTPConnectProxyHandler)
-        httpd.timeout = 30
+        httpd.timeout = 10
         while not self._stopped:
             httpd.handle_request()
diff --git a/monkey/infection_monkey/transport/tcp.py b/monkey/infection_monkey/transport/tcp.py
index 2e13d6c43..500dc2a22 100644
--- a/monkey/infection_monkey/transport/tcp.py
+++ b/monkey/infection_monkey/transport/tcp.py
@@ -6,7 +6,7 @@ from threading import Thread
 from infection_monkey.transport.base import TransportProxyBase, update_last_serve_time
 
 READ_BUFFER_SIZE = 8192
-DEFAULT_TIMEOUT = 30
+DEFAULT_TIMEOUT = 10
 
 logger = getLogger(__name__)