diff --git a/src/Microsoft.AspNetCore/WebHost.cs b/src/Microsoft.AspNetCore/WebHost.cs
index 5cc626fd5e..594eb6a0c5 100644
--- a/src/Microsoft.AspNetCore/WebHost.cs
+++ b/src/Microsoft.AspNetCore/WebHost.cs
@@ -181,6 +181,10 @@ namespace Microsoft.AspNetCore
                     logging.AddDebug();
                 })
                 .UseIISIntegration()
+                .UseDefaultServiceProvider((context, options) =>
+                {
+                    options.ValidateScopes = context.HostingEnvironment.IsDevelopment();
+                })
                 .ConfigureServices(services =>
                 {
                     services.AddSingleton<IStartupFilter, WebHostStartupFilter>();