diff --git a/src/structures/Message.js b/src/structures/Message.js
index 1d3a9d6b..f1ac639f 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -224,15 +224,8 @@ class Message extends Base {
         }
       : null;
 
-    /**
-     * The message this message replies to
-     * @type {?Message}
-     */
     if ('referenced_message' in data) {
-      this.replyReference =
-        this.channel.messages.get(data.referenced_message.id) || this.channel.messages.add(data.referenced_message);
-    } else {
-      this.replyReference = null;
+      this.channel.messages.add(data.referenced_message);
     }
   }
 
@@ -429,6 +422,12 @@ class Message extends Base {
     );
   }
 
+  get referencedMessage() {
+    return this.reference.messageID && this.client.channels.cache.has(this.reference.channelID)
+      ? this.client.channels.resolve(this.reference.channelID).messages.resolve(this.reference.messageID)
+      : null;
+  }
+
   /**
    * Options that can be passed into editMessage.
    * @typedef {Object} MessageEditOptions