diff --git a/src/structures/APIMessage.js b/src/structures/APIMessage.js
index ee2fe36e..c44ef5ba 100644
--- a/src/structures/APIMessage.js
+++ b/src/structures/APIMessage.js
@@ -172,7 +172,9 @@ class APIMessage {
 
     let message_reference;
     if (typeof this.options.replyTo !== 'undefined') {
-      const message_id = this.target.messages.resolveID(this.options.replyTo);
+      const message_id = this.isMessage
+        ? this.target.channel.messages.resolveID(this.options.replyTo)
+        : this.target.messages.resolveID(this.options.replyTo);
       if (message_id) {
         message_reference = { message_id };
       }
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 2ae7c27f..0c4590fe 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1012,7 +1012,7 @@ declare module 'discord.js' {
     public webhookID: Snowflake | null;
     public flags: Readonly<MessageFlags>;
     public reference: MessageReference | null;
-    public replyReference: Message | null;
+    public readonly referencedMessage: Message | null;
     public awaitReactions(
       filter: CollectorFilter,
       options?: AwaitReactionsOptions,