diff --git a/src/client/ClientDataManager.js b/src/client/ClientDataManager.js
index c924e1c8e..8ef270a50 100644
--- a/src/client/ClientDataManager.js
+++ b/src/client/ClientDataManager.js
@@ -39,10 +39,10 @@ class ClientDataManager {
     return guild;
   }
 
-  newUser(data) {
+  newUser(data, cache = true) {
     if (this.client.users.has(data.id)) return this.client.users.get(data.id);
     const user = new User(this.client, data);
-    this.client.users.set(user.id, user);
+    if (cache) this.client.users.set(user.id, user);
     return user;
   }
 
diff --git a/src/structures/Message.js b/src/structures/Message.js
index 6479e570a..ca9441bdc 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -55,7 +55,7 @@ class Message {
      * The author of the message
      * @type {User}
      */
-    this.author = this.client.dataManager.newUser(data.author);
+    this.author = this.client.dataManager.newUser(data.author, !data.webhook_id);
 
     /**
      * Represents the author of the message as a guild member