diff --git a/ipfsapi/client/__init__.py b/ipfsapi/client/__init__.py
index 95fac396..63a327fc 100644
--- a/ipfsapi/client/__init__.py
+++ b/ipfsapi/client/__init__.py
@@ -187,7 +187,7 @@ def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, base=DEFAULT_BASE,
 			pass
 		
 		addr = "/{0}/{1}/tcp/{2}/{3}".format(host_type, url.hostname, url.port, url.scheme)
-		super(Client, self).__init__(addr, base, chunk_size, **defaults)
+		super(Client, self).__init__(addr, base, chunk_size, timeout=None, **defaults)
 
 
 	def __getattribute__(self, name):