diff --git a/src/sakia/data/connectors/bma.py b/src/sakia/data/connectors/bma.py
index 5f360c92eb3dceb9827167da812b9d98fd807cc5..3b5267382113084f5707637b3994b1bb4d0189fb 100644
--- a/src/sakia/data/connectors/bma.py
+++ b/src/sakia/data/connectors/bma.py
@@ -364,8 +364,8 @@ class BmaConnector:
         replies = []
 
         if len(endpoints) > 0:
-            for endpoint in endpoints:
-                async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession() as session:
+                for endpoint in endpoints:
                     self._logger.debug("Trying to connect to: " + str(endpoint))
                     _client = client.Client(
                         endpoint, session, proxy=self._user_parameters.proxy()
@@ -373,7 +373,8 @@ class BmaConnector:
                     reply = asyncio.ensure_future(_client(request, **req_args))
                     replies.append(reply)
 
-            result = await asyncio.gather(*replies, return_exceptions=True)
+                result = await asyncio.gather(*replies, return_exceptions=True)
+
             return tuple(result)
         else:
             raise NoPeerAvailable("", len(endpoints))