diff --git a/src/structures/Message.js b/src/structures/Message.js
index a23fdf6..5afa2da 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -973,7 +973,9 @@ class Message extends Base {
       this.tts === message.tts &&
       this.nonce === message.nonce &&
       this.embeds.length === message.embeds.length &&
-      this.attachments.length === message.attachments.length;
+      this.attachments.size === message.attachments.size &&
+      this.attachments.every(attachment => message.attachments.has(attachment.id)) &&
+      this.embeds.every((embed, index) => embed.equals(message.embeds[index]));
 
     if (equal && rawData) {
       equal =