diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
index 71a24757a..8c2f532f2 100644
--- a/src/client/websocket/WebSocketManager.js
+++ b/src/client/websocket/WebSocketManager.js
@@ -424,8 +424,11 @@ class WebSocketManager {
       this.debug('Tried to mark self as ready, but already ready');
       return;
     }
+
     this.status = Status.READY;
 
+    this.client.readyAt = new Date();
+
     /**
      * Emitted when the client becomes ready to start working.
      * @event Client#ready
diff --git a/src/client/websocket/handlers/READY.js b/src/client/websocket/handlers/READY.js
index 74b1e1b9a..89f535f3b 100644
--- a/src/client/websocket/handlers/READY.js
+++ b/src/client/websocket/handlers/READY.js
@@ -6,7 +6,6 @@ module.exports = (client, { d: data }, shard) => {
   if (!ClientUser) ClientUser = require('../../../structures/ClientUser');
   const clientUser = new ClientUser(client, data.user);
   client.user = clientUser;
-  client.readyAt = new Date();
   client.users.set(clientUser.id, clientUser);
 
   for (const guild of data.guilds) {