diff --git a/docker/client.py b/docker/client.py
index 6bd6d913..678d9a34 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -1038,11 +1038,11 @@ class Client(requests.Session):
         res = self._post(url)
         self._raise_for_status(res)
 
-    def wait(self, container):
+    def wait(self, container, timeout=None):
         if isinstance(container, dict):
             container = container.get('Id')
         url = self._url("/containers/{0}/wait".format(container))
-        res = self._post(url, timeout=None)
+        res = self._post(url, timeout=timeout)
         self._raise_for_status(res)
         json_ = res.json()
         if 'StatusCode' in json_: