diff --git a/src/Discord.Net.WebSocket/ConnectionManager.cs b/src/Discord.Net.WebSocket/ConnectionManager.cs
index 8c9c743cb..c90448735 100644
--- a/src/Discord.Net.WebSocket/ConnectionManager.cs
+++ b/src/Discord.Net.WebSocket/ConnectionManager.cs
@@ -109,6 +109,7 @@ namespace Discord
         public virtual Task StopAsync()
         {
             Cancel();
+            _task?.ConfigureAwait(false).GetAwaiter().GetResult();
             return Task.CompletedTask;
         }