diff --git a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
index 4e8ef2664..fb93cc5ec 100644
--- a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
+++ b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
@@ -160,14 +160,15 @@ namespace Discord.Commands
 
             var createInstance = ReflectionUtils.CreateBuilder<IModuleBase>(typeInfo, service);
 
-            builder.Callback = (ctx, args, map) => 
+            builder.Callback = async (ctx, args, map) => 
             {
                 var instance = createInstance(map);
                 instance.SetContext(ctx);
                 try
                 {
                     instance.BeforeExecute();
-                    return method.Invoke(instance, args) as Task ?? Task.Delay(0);
+                    var task = method.Invoke(instance, args) as Task ?? Task.Delay(0);
+                    await task.ConfigureAwait(false);
                 }
                 finally
                 {