diff --git a/src/client/websocket/WebSocketShard.js b/src/client/websocket/WebSocketShard.js
index 8d9afd313..5171d7e59 100644
--- a/src/client/websocket/WebSocketShard.js
+++ b/src/client/websocket/WebSocketShard.js
@@ -373,7 +373,6 @@ class WebSocketShard extends EventEmitter {
         this.debug(`[READY] Session ${this.sessionID}.`);
         this.lastHeartbeatAcked = true;
         this.sendHeartbeat('ReadyHeartbeat');
-        this.checkReady();
         break;
       case WSEvents.RESUMED: {
         /**
diff --git a/src/client/websocket/handlers/READY.js b/src/client/websocket/handlers/READY.js
index 1612cfa02..002575023 100644
--- a/src/client/websocket/handlers/READY.js
+++ b/src/client/websocket/handlers/READY.js
@@ -16,4 +16,6 @@ module.exports = (client, { d: data }, shard) => {
     guild.shardID = shard.id;
     client.guilds.add(guild);
   }
+
+  shard.checkReady();
 };