diff --git a/discord/shard.py b/discord/shard.py
index 8fad51e9b..970f151de 100644
--- a/discord/shard.py
+++ b/discord/shard.py
@@ -236,9 +236,8 @@ class AutoShardedClient(Client):
 
         self._closed.set()
 
-        for shard in self.shards.values():
-            yield from shard.ws.close()
-
+        to_close = [shard.ws.close() for shard in self.shards.values()]
+        yield from asyncio.wait(to_close, loop=self.loop)
         yield from self.http.close()
 
     @asyncio.coroutine