diff --git a/src/Discord.Net.Commands/CommandContext.cs b/src/Discord.Net.Commands/CommandContext.cs
index 914b41b30..67cd1db93 100644
--- a/src/Discord.Net.Commands/CommandContext.cs
+++ b/src/Discord.Net.Commands/CommandContext.cs
@@ -2,6 +2,7 @@
 {
     public struct CommandContext
     {
+        public IDiscordClient Client { get; }
         public IGuild Guild { get; }
         public IMessageChannel Channel { get; }
         public IUser User { get; }
@@ -9,8 +10,9 @@
 
         public bool IsPrivate => Channel is IPrivateChannel;
 
-        public CommandContext(IGuild guild, IMessageChannel channel, IUser user, IUserMessage msg)
+        public CommandContext(IDiscordClient client, IGuild guild, IMessageChannel channel, IUser user, IUserMessage msg)
         {
+            Client = client;
             Guild = guild;
             Channel = channel;
             User = user;
diff --git a/src/Discord.Net.Commands/ModuleBase.cs b/src/Discord.Net.Commands/ModuleBase.cs
index 544e37f65..c8d56f819 100644
--- a/src/Discord.Net.Commands/ModuleBase.cs
+++ b/src/Discord.Net.Commands/ModuleBase.cs
@@ -4,7 +4,6 @@ namespace Discord.Commands
 {
     public abstract class ModuleBase
     {
-        public IDiscordClient Client { get; internal set; }
         public CommandContext Context { get; internal set; }
 
         protected virtual async Task ReplyAsync(string message, bool isTTS = false, RequestOptions options = null)