diff --git a/nodepool/nodeutils.py b/nodepool/nodeutils.py
index 884c6419a..1db8de4ce 100755
--- a/nodepool/nodeutils.py
+++ b/nodepool/nodeutils.py
@@ -71,7 +71,7 @@ def keyscan(ip, port=22, timeout=60):
             sock.settimeout(timeout)
             sock.connect(sockaddr)
             t = paramiko.transport.Transport(sock)
-            t.start_client()
+            t.start_client(timeout=timeout)
             key = t.get_remote_server_key()
             break
         except socket.error as e: