diff --git a/elasticsearch_async/connection.py b/elasticsearch_async/connection.py
index 6d3c912..b4fde0f 100644
--- a/elasticsearch_async/connection.py
+++ b/elasticsearch_async/connection.py
@@ -65,7 +65,7 @@ def __init__(self, host='localhost', port=9200, http_auth=None,
 
         self.session = aiohttp.ClientSession(
             auth=http_auth,
-            conn_timeout=self.timeout,
+            timeout=aiohttp.ClientTimeout(total=self.timeout),
             connector=aiohttp.TCPConnector(
                 loop=self.loop,
                 verify_ssl=verify_certs,