diff --git a/src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs b/src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs
index c9e679669..c7dabefc8 100644
--- a/src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs
+++ b/src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs
@@ -7,32 +7,39 @@ namespace Discord.WebSocket
     {
         //General
         /// <summary> Fired when a shard is connected to the Discord gateway. </summary>
-        public event Func<DiscordSocketClient, Task> ShardConnected 
+        public event Func<DiscordSocketClient, Task> ShardConnected
         {
             add { _shardConnectedEvent.Add(value); }
             remove { _shardConnectedEvent.Remove(value); }
         }
         private readonly AsyncEvent<Func<DiscordSocketClient, Task>> _shardConnectedEvent = new AsyncEvent<Func<DiscordSocketClient, Task>>();
         /// <summary> Fired when a shard is disconnected from the Discord gateway. </summary>
-        public event Func<Exception, DiscordSocketClient, Task> ShardDisconnected 
+        public event Func<Exception, DiscordSocketClient, Task> ShardDisconnected
         {
             add { _shardDisconnectedEvent.Add(value); }
             remove { _shardDisconnectedEvent.Remove(value); }
         }
         private readonly AsyncEvent<Func<Exception, DiscordSocketClient, Task>> _shardDisconnectedEvent = new AsyncEvent<Func<Exception, DiscordSocketClient, Task>>();
         /// <summary> Fired when a guild data for a shard has finished downloading. </summary>
-        public event Func<DiscordSocketClient, Task> ShardReady 
+        public event Func<DiscordSocketClient, Task> ShardReady
         {
             add { _shardReadyEvent.Add(value); }
             remove { _shardReadyEvent.Remove(value); }
         }
         private readonly AsyncEvent<Func<DiscordSocketClient, Task>> _shardReadyEvent = new AsyncEvent<Func<DiscordSocketClient, Task>>();
         /// <summary> Fired when a shard receives a heartbeat from the Discord gateway. </summary>
-        public event Func<int, int, DiscordSocketClient, Task> ShardLatencyUpdated 
+        public event Func<int, int, DiscordSocketClient, Task> ShardLatencyUpdated
         {
             add { _shardLatencyUpdatedEvent.Add(value); }
             remove { _shardLatencyUpdatedEvent.Remove(value); }
         }
         private readonly AsyncEvent<Func<int, int, DiscordSocketClient, Task>> _shardLatencyUpdatedEvent = new AsyncEvent<Func<int, int, DiscordSocketClient, Task>>();
+        /// <summary> Fired when all shards are ready. </summary>
+        public event Func<Task> Ready
+        {
+            add { _readyEvent.Add(value); }
+            remove { _readyEvent.Remove(value); }
+        }
+        private readonly AsyncEvent<Func<Task>> _readyEvent = new AsyncEvent<Func<Task>>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Discord.Net.WebSocket/DiscordShardedClient.cs b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
index 0877abfd9..77970ba8f 100644
--- a/src/Discord.Net.WebSocket/DiscordShardedClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
@@ -18,6 +18,7 @@ namespace Discord.WebSocket
         private int[] _shardIds;
         private DiscordSocketClient[] _shards;
         private int _totalShards;
+        private int _shardsReady;
 
         private bool _isDisposed;
 
@@ -290,16 +291,26 @@ namespace Discord.WebSocket
             };
             if (isPrimary)
             {
-                client.Ready += () =>
+                client.Ready += async () =>
                 {
                     CurrentUser = client.CurrentUser;
-                    return Task.Delay(0);
+                    if (_totalShards >= _shardsReady++) //to account for re-identifies, don't see a better way to handle this
+                    {
+                        await _readyEvent.InvokeAsync();
+                    }
                 };
             }
 
             client.Connected += () => _shardConnectedEvent.InvokeAsync(client);
             client.Disconnected += (exception) => _shardDisconnectedEvent.InvokeAsync(exception, client);
-            client.Ready += () => _shardReadyEvent.InvokeAsync(client);
+            client.Ready += async () =>
+            {
+                await _shardReadyEvent.InvokeAsync(client);
+                if (_totalShards >= _shardsReady++) //to account for re-identifies, don't see a better way to handle this
+                {
+                    await _readyEvent.InvokeAsync();
+                }
+            };
             client.LatencyUpdated += (oldLatency, newLatency) => _shardLatencyUpdatedEvent.InvokeAsync(oldLatency, newLatency, client);
 
             client.ChannelCreated += (channel) => _channelCreatedEvent.InvokeAsync(channel);