diff --git a/src/Discord.Net/TaskManager.cs b/src/Discord.Net/TaskManager.cs
index 7c9a667ce..d43372396 100644
--- a/src/Discord.Net/TaskManager.cs
+++ b/src/Discord.Net/TaskManager.cs
@@ -162,7 +162,10 @@ namespace Discord
         public void ThrowException()
         {
             using (_lock.Lock())
-                _stopReason?.Throw();
+            {
+                if (!WasStopExpected)
+                    _stopReason?.Throw();
+            }
         }
         public void ClearException()
         {