diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 vcversioner
 
 # remote storage API server
-aiohttp >= 2.1.0
+aiohttp >= 3
 click
 
 # optional dependencies
diff --git a/swh/objstorage/api/server.py b/swh/objstorage/api/server.py
--- a/swh/objstorage/api/server.py
+++ b/swh/objstorage/api/server.py
@@ -149,8 +149,8 @@
     response = aiohttp.web.StreamResponse()
     await response.prepare(request)
     for chunk in request.app['objstorage'].get_stream(obj_id, 2 << 20):
-        response.write(chunk)
-        await response.drain()
+        await response.write(chunk)
+    await response.write_eof()
     return response
 
 
@@ -165,8 +165,8 @@
     await response.prepare(request)
     for obj_id in request.app['objstorage'].list_content(
             last_obj_id, limit=limit):
-        response.write(obj_id)
-        await response.drain()
+        await response.write(obj_id)
+    await response.write_eof()
     return response