diff --git a/lib/structures/Message.js b/lib/structures/Message.js
index a2d5adbfb..effe2a0fa 100644
--- a/lib/structures/Message.js
+++ b/lib/structures/Message.js
@@ -125,6 +125,9 @@ class Message extends Base {
         if(this.channel.guild) {
             if(data.member) {
                 data.member.id = this.author.id;
+                if(data.author) {
+                    data.member.user = data.author;
+                }
                 this.member = this.channel.guild.members.update(data.member, this.channel.guild);
             } else if(this.channel.guild.members.has(this.author.id)) {
                 this.member = this.channel.guild.members.get(this.author.id);