diff --git a/src/Discord.Net.WebSocket/BaseSocketClient.cs b/src/Discord.Net.WebSocket/BaseSocketClient.cs
index 425889613..291d631ae 100644
--- a/src/Discord.Net.WebSocket/BaseSocketClient.cs
+++ b/src/Discord.Net.WebSocket/BaseSocketClient.cs
@@ -209,6 +209,12 @@ namespace Discord.WebSocket
         /// <param name="name">The name of the game.</param>
         /// <param name="streamUrl">If streaming, the URL of the stream. Must be a valid Twitch URL.</param>
         /// <param name="type">The type of the game.</param>
+        /// <remarks>
+        ///     <note type="warning">
+        ///         Bot accounts cannot use <see cref="ActivityType.CustomStatus"/> as their activity
+        ///         and it will have no effect.
+        ///     </note>
+        /// </remarks>
         /// <returns>
         ///     A task that represents the asynchronous set operation.
         /// </returns>
@@ -222,6 +228,10 @@ namespace Discord.WebSocket
         ///         Discord will only accept setting of name and the type of activity.
         ///     </note>
         ///     <note type="warning">
+        ///         Bot accounts cannot use <see cref="ActivityType.CustomStatus"/> as their activity
+        ///         and it will have no effect.
+        ///     </note>
+        ///     <note type="warning">
         ///         Rich Presence cannot be set via this method or client. Rich Presence is strictly limited to RPC
         ///         clients only. 
         ///     </note>
diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 7e0576b22..b43db5d98 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -450,8 +450,6 @@ namespace Discord.WebSocket
         /// </example>
         public override async Task SetGameAsync(string name, string streamUrl = null, ActivityType type = ActivityType.Playing)
         {
-            if (type == ActivityType.CustomStatus)
-                throw new InvalidOperationException("Only user accounts can use CustomStatus as their activity.");
             if (!string.IsNullOrEmpty(streamUrl))
                 Activity = new StreamingGame(name, streamUrl);
             else if (!string.IsNullOrEmpty(name))