diff --git a/src/Microsoft.AspNet.Hosting/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/HostingEngine.cs
index eac137bb38..88f1dc5184 100644
--- a/src/Microsoft.AspNet.Hosting/HostingEngine.cs
+++ b/src/Microsoft.AspNet.Hosting/HostingEngine.cs
@@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Hosting
         {
             if (context.ServerFactory == null)
             {
-                context.ServerFactory = context.Services.GetService<IServerFactory>();
+                context.ServerFactory = context.Services.GetServiceOrDefault<IServerFactory>();
             }
             if (context.ServerFactory != null)
             {