diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index e39a739f1..6b826be50 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -1052,13 +1052,13 @@ namespace Discord
         {
             try
             {
-                asyncAction().GetAwaiter().GetResult(); //Avoids creating AggregateExceptions
+                AsyncContext.Run(asyncAction);
             }
             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>
-        public void Run()
+        public void Wait()
         {
             _disconnectedEvent.WaitOne();
         }