diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 54a527c0b..3933742f3 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -73,7 +73,7 @@ namespace Discord.Commands
                 _moduleLock.Release();
             }
         }
-        public async Task<ModuleInfo> AddModuleAsync<T>() where T : IModuleBase
+        public async Task<ModuleInfo> AddModuleAsync<T>() where T : IModuleBase<ICommandContext>
         {
             await _moduleLock.WaitAsync().ConfigureAwait(false);
             try
@@ -143,7 +143,7 @@ namespace Discord.Commands
                 _moduleLock.Release();
             }
         }
-        public async Task<bool> RemoveModuleAsync<T>() where T : IModuleBase
+        public async Task<bool> RemoveModuleAsync<T>() where T : IModuleBase<ICommandContext>
         {
             await _moduleLock.WaitAsync().ConfigureAwait(false);
             try
diff --git a/src/Discord.Net.Commands/IModuleBase.cs b/src/Discord.Net.Commands/IModuleBase.cs
index fda768b53..14caea612 100644
--- a/src/Discord.Net.Commands/IModuleBase.cs
+++ b/src/Discord.Net.Commands/IModuleBase.cs
@@ -1,5 +1,10 @@
-namespace Discord.Commands
+namespace Discord.Commands
 {
+    public interface IModuleBase<out T>
+        where T : ICommandContext
+    {
+    }
+
     internal interface IModuleBase
     {
         void SetContext(ICommandContext context);
diff --git a/src/Discord.Net.Commands/ModuleBase.cs b/src/Discord.Net.Commands/ModuleBase.cs
index a38ffce06..c85a4b4ba 100644
--- a/src/Discord.Net.Commands/ModuleBase.cs
+++ b/src/Discord.Net.Commands/ModuleBase.cs
@@ -5,7 +5,7 @@ namespace Discord.Commands
 {
     public abstract class ModuleBase : ModuleBase<CommandContext> { }
 
-    public abstract class ModuleBase<T> : IModuleBase
+    public abstract class ModuleBase<T> : IModuleBase, IModuleBase<T>
         where T : class, ICommandContext
     {
         public T Context { get; private set; }