diff --git a/src/Discord.Net/API/DiscordSocketApiClient.cs b/src/Discord.Net/API/DiscordSocketApiClient.cs
index 70d660cd4..be149607d 100644
--- a/src/Discord.Net/API/DiscordSocketApiClient.cs
+++ b/src/Discord.Net/API/DiscordSocketApiClient.cs
@@ -179,7 +179,7 @@ namespace Discord.API
         {
             return await SendAsync<GetGatewayResponse>("GET", "gateway", options: options).ConfigureAwait(false);
         }
-        public async Task SendIdentifyAsync(int largeThreshold = 100, bool useCompression = true, RequestOptions options = null)
+        public async Task SendIdentifyAsync(int largeThreshold = 100, bool useCompression = true, int shardID = 0, int totalShards = 1, RequestOptions options = null)
         {
             var props = new Dictionary<string, string>
             {
@@ -190,8 +190,11 @@ namespace Discord.API
                 Token = _authToken,
                 Properties = props,
                 LargeThreshold = largeThreshold,
-                UseCompression = useCompression
+                UseCompression = useCompression,
             };
+            if (totalShards > 1)
+                msg.ShardingParams = new int[] { shardID, totalShards };
+
             await SendGatewayAsync(GatewayOpCode.Identify, msg, options: options).ConfigureAwait(false);
         }
         public async Task SendResumeAsync(string sessionId, int lastSeq, RequestOptions options = null)
diff --git a/src/Discord.Net/API/Gateway/IdentifyParams.cs b/src/Discord.Net/API/Gateway/IdentifyParams.cs
index 0a056e225..2681b6708 100644
--- a/src/Discord.Net/API/Gateway/IdentifyParams.cs
+++ b/src/Discord.Net/API/Gateway/IdentifyParams.cs
@@ -14,5 +14,7 @@ namespace Discord.API.Gateway
         public int LargeThreshold { get; set; }
         [JsonProperty("compress")]
         public bool UseCompression { get; set; }
+        [JsonProperty("shard")]
+        public Optional<int[]> ShardingParams { get; set; }
     }
 }
diff --git a/src/Discord.Net/DiscordConfig.cs b/src/Discord.Net/DiscordConfig.cs
index 2f0f50018..fdecde6b4 100644
--- a/src/Discord.Net/DiscordConfig.cs
+++ b/src/Discord.Net/DiscordConfig.cs
@@ -5,7 +5,7 @@ namespace Discord
     public class DiscordConfig
     {
         public const int APIVersion = 6;        
-        public static string Version { get; } = typeof(DiscordRestConfig).GetTypeInfo().Assembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion ?? "Unknown";
+        public static string Version { get; } = typeof(DiscordRestConfig).GetTypeInfo().Assembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
 
         public static readonly string ClientAPIUrl = $"https://discordapp.com/api/v{APIVersion}/";
         public const string CDNUrl = "https://cdn.discordapp.com/";
diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index 3d485d7e5..72d48079f 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -166,7 +166,7 @@ namespace Discord
                 if (_sessionId != null)
                     await ApiClient.SendResumeAsync(_sessionId, _lastSeq).ConfigureAwait(false);
                 else
-                    await ApiClient.SendIdentifyAsync().ConfigureAwait(false);
+                    await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards:TotalShards).ConfigureAwait(false);
 
                 await _connectTask.Task.ConfigureAwait(false);
                 _canReconnect = true;
@@ -534,7 +534,7 @@ namespace Discord
 
                             _sessionId = null;
                             _lastSeq = 0;
-                            await ApiClient.SendIdentifyAsync().ConfigureAwait(false);
+                            await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards).ConfigureAwait(false);
                         }
                         break;
                     case GatewayOpCode.Reconnect: