diff --git a/artiq/protocols/pc_rpc.py b/artiq/protocols/pc_rpc.py
index 735dcd9fb..6d9feadb5 100644
--- a/artiq/protocols/pc_rpc.py
+++ b/artiq/protocols/pc_rpc.py
@@ -292,6 +292,7 @@ class BestEffortClient:
         else:
             self.__socket = socket.create_connection(
                 (self.__host, self.__port), timeout)
+            self.__socket.settimeout(None)
         self.__socket.sendall(_init_string)
         server_identification = self.__recv()
         target_name = _validate_target_name(self.__target_name,