diff --git a/discord/shard.py b/discord/shard.py
index 0f63b65c4..d96ad0712 100644
--- a/discord/shard.py
+++ b/discord/shard.py
@@ -221,9 +221,6 @@ class AutoShardedClient(Client):
         self.shards[shard_id] = ret = Shard(ws, self)
         ret.launch()
 
-        if len(self.shards) == self.shard_count:
-            self._connection.shards_launched.set()
-
     async def launch_shards(self):
         if self.shard_count is None:
             self.shard_count, gateway = await self.http.get_bot_gateway()
@@ -241,6 +238,8 @@ class AutoShardedClient(Client):
             if shard_id != last_shard_id:
                 await asyncio.sleep(5.0)
 
+        self._connection.shards_launched.set()
+
     async def _connect(self):
         await self.launch_shards()