diff --git a/src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs
index 7bf1f59c23..acefa86bc7 100644
--- a/src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs
+++ b/src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs
@@ -15,9 +15,9 @@ namespace Microsoft.AspNet.Hosting.Builder
             _serviceProvider = serviceProvider;
         }
 
-        public IApplicationBuilder CreateBuilder()
+        public IApplicationBuilder CreateBuilder(object server)
         {
-            return new ApplicationBuilder(_serviceProvider);
+            return new ApplicationBuilder(_serviceProvider, server);
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs
index 45194717bc..c866b2d79d 100644
--- a/src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs
+++ b/src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs
@@ -7,6 +7,6 @@ namespace Microsoft.AspNet.Hosting.Builder
 {
     public interface IApplicationBuilderFactory
     {
-        IApplicationBuilder CreateBuilder();
+        IApplicationBuilder CreateBuilder(object server);
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Hosting/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/HostingEngine.cs
index 0f6826737c..4369057f46 100644
--- a/src/Microsoft.AspNet.Hosting/HostingEngine.cs
+++ b/src/Microsoft.AspNet.Hosting/HostingEngine.cs
@@ -51,8 +51,8 @@ namespace Microsoft.AspNet.Hosting
         public virtual IDisposable Start()
         {
             EnsureApplicationServices();
-            EnsureBuilder();
             EnsureServer();
+            EnsureBuilder();
 
             var applicationDelegate = BuildApplicationDelegate();
 
@@ -105,17 +105,6 @@ namespace Microsoft.AspNet.Hosting
             }
         }
 
-        private void EnsureBuilder()
-        {
-            if (_builderFactory == null)
-            {
-                _builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>();
-            }
-
-            _builder = _builderFactory.CreateBuilder();
-            _builder.ApplicationServices = _applicationServices;
-        }
-
         private void EnsureServer()
         {
             if (_serverFactory == null)
@@ -130,7 +119,17 @@ namespace Microsoft.AspNet.Hosting
             }
 
             _serverInstance = _serverFactory.Initialize(_config);
-            _builder.Server = _serverInstance;
+        }
+
+        private void EnsureBuilder()
+        {
+            if (_builderFactory == null)
+            {
+                _builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>();
+            }
+
+            _builder = _builderFactory.CreateBuilder(_serverInstance);
+            _builder.ApplicationServices = _applicationServices;
         }
 
         private RequestDelegate BuildApplicationDelegate()