diff --git a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
index ec593eb895..5f2dd8e9e6 100644
--- a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.StaticFiles
 
             if (_htmlEncoder == null)
             {
-                _htmlEncoder = context.ApplicationServices.GetHtmlEncoder();
+                _htmlEncoder = context.RequestServices.GetHtmlEncoder();
             }
 
             context.Response.ContentType = TextHtmlUtf8;