diff --git a/discord/client.py b/discord/client.py
index 94d7b5b1d..ebf9bfe62 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -470,7 +470,10 @@ class Client:
             gathered = asyncio.gather(*pending)
             try:
                 gathered.cancel()
-                self.loop.run_forever()
+                self.loop.run_until_complete(gathered)
+
+                # we want to retrieve any exceptions to make sure that
+                # they don't nag us about it being un-retrieved.
                 gathered.exception()
             except:
                 pass