diff --git a/src/Microsoft.AspNet.Hosting/Internal/Application.cs b/src/Microsoft.AspNet.Hosting/Internal/Application.cs
index 0603b48628..ecbb916a6e 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/Application.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/Application.cs
@@ -32,7 +32,6 @@ namespace Microsoft.AspNet.Hosting.Internal
         public void Dispose()
         {
             _stop.Dispose();
-            (_services as IDisposable)?.Dispose();
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
index 50cd13443f..aa68a00689 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
@@ -127,6 +127,7 @@ namespace Microsoft.AspNet.Hosting.Internal
                 _applicationLifetime.NotifyStopping();
                 server.Dispose();
                 _applicationLifetime.NotifyStopped();
+                (_applicationServices as IDisposable)?.Dispose();
             }));
         }