diff --git a/packages/discord.js/src/client/actions/Action.js b/packages/discord.js/src/client/actions/Action.js
index 540a3fe85bac..da5857bb395b 100644
--- a/packages/discord.js/src/client/actions/Action.js
+++ b/packages/discord.js/src/client/actions/Action.js
@@ -24,11 +24,7 @@ class GenericAction {
   }
 
   getPayload(data, manager, id, partialType, cache) {
-    const existing = manager.cache.get(id);
-    if (!existing && this.client.options.partials.includes(partialType)) {
-      return manager._add(data, cache);
-    }
-    return existing;
+    return this.client.options.partials.includes(partialType) ? manager._add(data, cache) : manager.cache.get(id);
   }
 
   getChannel(data) {
@@ -39,7 +35,8 @@ class GenericAction {
         {
           id,
           guild_id: data.guild_id,
-          recipients: [data.author ?? data.user ?? { id: data.user_id }],
+          recipients: data.recipients ?? [data.author ?? data.user ?? { id: data.user_id }],
+          last_message_id: data.last_message_id,
         },
         this.client.channels,
         id,