diff --git a/trezor_agent/server.py b/trezor_agent/server.py
index 38835fe..a04a3a4 100644
--- a/trezor_agent/server.py
+++ b/trezor_agent/server.py
@@ -63,6 +63,7 @@ def server_thread(server, handler, quit_event):
 
     def accept_connection():
         conn, _ = server.accept()
+        conn.settimeout(None)
         return conn
 
     while True:
diff --git a/trezor_agent/tests/test_server.py b/trezor_agent/tests/test_server.py
index f8a22fd..0557aba 100644
--- a/trezor_agent/tests/test_server.py
+++ b/trezor_agent/tests/test_server.py
@@ -32,6 +32,9 @@ class FakeSocket(object):
     def close(self):
         pass
 
+    def settimeout(self, value):
+        pass
+
 
 def test_handle():
     handler = protocol.Handler(keys=[], signer=None)