diff --git a/src/Discord.Net.Core/Entities/Messages/Embed.cs b/src/Discord.Net.Core/Entities/Messages/Embed.cs
index c4ff27f60..c1478f56c 100644
--- a/src/Discord.Net.Core/Entities/Messages/Embed.cs
+++ b/src/Discord.Net.Core/Entities/Messages/Embed.cs
@@ -119,7 +119,7 @@ namespace Discord
         /// <param name="embed">The <see cref="Embed"/> to compare with the current <see cref="Embed"/></param>
         /// <returns></returns>
         public bool Equals(Embed embed)
-            => GetHashCode() == embed.GetHashCode();
+            => GetHashCode() == embed?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs b/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs
index 63131e2fb..58abc2e03 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs
@@ -66,8 +66,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedAuthor">The <see cref="EmbedAuthor"/> to compare with the current <see cref="EmbedAuthor"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedAuthor embedAuthor)
-            => GetHashCode() == embedAuthor.GetHashCode();
+        public bool Equals(EmbedAuthor? embedAuthor)
+            => GetHashCode() == embedAuthor?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
index 0428f9ac7..db38b9fb7 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
@@ -507,6 +507,9 @@ namespace Discord
         /// <returns></returns>
         public bool Equals(EmbedBuilder embedBuilder)
         {
+            if (embedBuilder is null)
+                return false;
+
             if (Fields.Count != embedBuilder.Fields.Count)
                 return false;
 
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedField.cs b/src/Discord.Net.Core/Entities/Messages/EmbedField.cs
index 832e88148..8c51565b0 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedField.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedField.cs
@@ -61,8 +61,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedField"></param>
         /// <returns></returns>
-        public bool Equals(EmbedField embedField)
-            => GetHashCode() == embedField.GetHashCode();
+        public bool Equals(EmbedField? embedField)
+            => GetHashCode() == embedField?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs b/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs
index 3a839b609..7d86b02f5 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs
@@ -68,8 +68,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedFooter">The <see cref="EmbedFooter"/> to compare with the current <see cref="EmbedFooter"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedFooter embedFooter)
-            => GetHashCode() == embedFooter.GetHashCode();
+        public bool Equals(EmbedFooter? embedFooter)
+            => GetHashCode() == embedFooter?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs b/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs
index 90dd93cda..46d51da37 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs
@@ -78,8 +78,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedImage">The <see cref="EmbedImage"/> to compare with the current <see cref="EmbedImage"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedImage embedImage)
-            => GetHashCode() == embedImage.GetHashCode();
+        public bool Equals(EmbedImage? embedImage)
+            => GetHashCode() == embedImage?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs b/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs
index 277141d81..dc7a8feb5 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs
@@ -60,8 +60,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedProvider">The <see cref="EmbedProvider"/> to compare with the current <see cref="EmbedProvider"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedProvider embedProvider)
-            => GetHashCode() == embedProvider.GetHashCode();
+        public bool Equals(EmbedProvider? embedProvider)
+            => GetHashCode() == embedProvider?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs b/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs
index 557b2ad49..0e580eee0 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs
@@ -78,8 +78,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedThumbnail">The <see cref="EmbedThumbnail"/> to compare with the current <see cref="EmbedThumbnail"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedThumbnail embedThumbnail)
-            => GetHashCode() == embedThumbnail.GetHashCode();
+        public bool Equals(EmbedThumbnail? embedThumbnail)
+            => GetHashCode() == embedThumbnail?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()
diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs b/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs
index 9062aa89e..02e393954 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs
@@ -72,8 +72,8 @@ namespace Discord
         /// </summary>
         /// <param name="embedVideo">The <see cref="EmbedVideo"/> to compare with the current <see cref="EmbedVideo"/></param>
         /// <returns></returns>
-        public bool Equals(EmbedVideo embedVideo)
-            => GetHashCode() == embedVideo.GetHashCode();
+        public bool Equals(EmbedVideo? embedVideo)
+            => GetHashCode() == embedVideo?.GetHashCode();
 
         /// <inheritdoc />
         public override int GetHashCode()