diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 91472b9eb..c0c20f80f 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -159,8 +159,7 @@ namespace Discord.Commands
             try
             {
                 ModuleInfo module;
-                _typedModuleDefs.TryGetValue(typeof(T), out module);
-                if (module == default(ModuleInfo))
+                if (!_typedModuleDefs.TryRemove(typeof(T), out module))
                     return false;
 
                 return RemoveModuleInternal(module);