diff --git a/src/Discord.Net/DiscordWSClient.cs b/src/Discord.Net/DiscordWSClient.cs
index 14f020fda..f1c62ced6 100644
--- a/src/Discord.Net/DiscordWSClient.cs
+++ b/src/Discord.Net/DiscordWSClient.cs
@@ -289,9 +289,9 @@ namespace Discord
 		{
 			try
 			{
-				asyncAction().Wait();
+				asyncAction().GetAwaiter().GetResult(); //Avoids creating AggregateExceptions
 			}
-			catch (AggregateException ex) when (ex.InnerException is TaskCanceledException) { }
+			catch (TaskCanceledException) { }
 			_disconnectedEvent.WaitOne();
 		}
 		/// <summary> Blocking call that will not return until client has been stopped. This is mainly intended for use in console applications. </summary>