diff --git a/src/Kestrel/ServerFactory.cs b/src/Kestrel/ServerFactory.cs
index e7e19f8353..e34217e081 100644
--- a/src/Kestrel/ServerFactory.cs
+++ b/src/Kestrel/ServerFactory.cs
@@ -46,7 +46,7 @@ namespace Kestrel
                     async frame =>
                     {
                         var request = new ServerRequest(frame);
-                        await application.Invoke(request.Features);
+                        await application.Invoke(request.Features).ConfigureAwait(false);
                     }));
             }
             disposables.Add(engine);