diff --git a/discord/state.py b/discord/state.py
index 82f5371ca..8374b30e3 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -1118,7 +1118,7 @@ class AutoShardedConnectionState(ConnectionState):
                             current_bucket = []
 
                     # Chunk the guild in the background while we wait for GUILD_CREATE streaming
-                    future = asyncio.create_task(self.chunk_guild(guild))
+                    future = asyncio.ensure_future(self.chunk_guild(guild))
                     current_bucket.append(future)
                 else:
                     future = self.loop.create_future()
diff --git a/discord/utils.py b/discord/utils.py
index fec7b5c09..03478b3f5 100644
--- a/discord/utils.py
+++ b/discord/utils.py
@@ -369,7 +369,7 @@ async def async_all(gen, *, check=_isawaitable):
 
 async def sane_wait_for(futures, *, timeout):
     ensured = [
-        asyncio.create_task(fut) for fut in futures
+        asyncio.ensure_future(fut) for fut in futures
     ]
     done, pending = await asyncio.wait(ensured, timeout=timeout, return_when=asyncio.ALL_COMPLETED)