diff --git a/tunnel-server/src/udstunnel.py b/tunnel-server/src/udstunnel.py
index a0e54c49f..95fe31699 100755
--- a/tunnel-server/src/udstunnel.py
+++ b/tunnel-server/src/udstunnel.py
@@ -230,6 +230,7 @@ def tunnel_main():
             try:
                 client, addr = sock.accept()
                 logger.debug('ACCEPTED CONNECTION from %s (%s)', addr, client)
+                client.settimeout(3.0)
                 # Select BEST process for sending this new connection
                 prcs.best_child().send(
                     message.Message(message.Command.TUNNEL, (client, addr))