diff --git a/src/Discord.Net.Core/Discord.Net.Core.xml b/src/Discord.Net.Core/Discord.Net.Core.xml
index f11fe4e9a..24ced574c 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.xml
+++ b/src/Discord.Net.Core/Discord.Net.Core.xml
@@ -5667,9 +5667,19 @@
                 A select menu for picking from choices
             </summary>
         </member>
+        <member name="T:Discord.IMessageComponent">
+            <summary>
+                Represents a message component on a message.
+            </summary>
+        </member>
         <member name="P:Discord.IMessageComponent.Type">
             <summary>
-                The <see cref="T:Discord.ComponentType"/> of this Message Component.
+                Gets the <see cref="T:Discord.ComponentType"/> of this Message Component.
+            </summary>
+        </member>
+        <member name="P:Discord.IMessageComponent.CustomId">
+            <summary>
+                Gets the custom id of the component if possible; otherwise <see langword="null"/>.
             </summary>
         </member>
         <member name="T:Discord.MessageComponent">
diff --git a/src/Discord.Net.Rest/API/Common/ActionRowComponent.cs b/src/Discord.Net.Rest/API/Common/ActionRowComponent.cs
index 4de9d6fe1..43b48f01a 100644
--- a/src/Discord.Net.Rest/API/Common/ActionRowComponent.cs
+++ b/src/Discord.Net.Rest/API/Common/ActionRowComponent.cs
@@ -33,5 +33,8 @@ namespace Discord.API
                 }
             }).ToArray();
         }
+
+        [JsonIgnore]
+        string IMessageComponent.CustomId => null;
     }
 }
diff --git a/src/Discord.Net.Rest/API/Common/ButtonComponent.cs b/src/Discord.Net.Rest/API/Common/ButtonComponent.cs
index b9d1147a2..afd50701b 100644
--- a/src/Discord.Net.Rest/API/Common/ButtonComponent.cs
+++ b/src/Discord.Net.Rest/API/Common/ButtonComponent.cs
@@ -30,7 +30,6 @@ namespace Discord.API
         [JsonProperty("disabled")]
         public Optional<bool> Disabled { get; set; }
 
-
         public ButtonComponent() { }
 
         public ButtonComponent(Discord.ButtonComponent c)
@@ -62,5 +61,8 @@ namespace Discord.API
                 }
             }
         }
+
+        [JsonIgnore]
+        string IMessageComponent.CustomId => this.CustomId.GetValueOrDefault();
     }
 }