diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs
index f93a6a31a1..8f8d950a47 100644
--- a/samples/MiddlewareAnalysisSample/Startup.cs
+++ b/samples/MiddlewareAnalysisSample/Startup.cs
@@ -18,9 +18,6 @@ namespace MiddlewareAnaysisSample
 
         public void Configure(IApplicationBuilder app, ILoggerFactory factory, DiagnosticListener diagnosticListener)
         {
-            // Displays all log levels
-            factory.AddConsole(LogLevel.Debug);
-
             // Listen for middleware events and log them to the console.
             var listener = new TestDiagnosticListener();
             diagnosticListener.SubscribeWithAdapter(listener);
@@ -53,7 +50,7 @@ namespace MiddlewareAnaysisSample
                     return next(context);
                 };
             });
-            
+
             app.Map("/throw", throwApp =>
             {
                 throwApp.Run(context => { throw new Exception("Application Exception"); });
@@ -85,6 +82,11 @@ namespace MiddlewareAnaysisSample
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
+                .ConfigureLogging((_, factory) =>
+                {
+                    factory.AddConsole();
+                    factory.AddFilter("Console", level => level >= LogLevel.Debug);
+                })
                 .UseKestrel()
                 .UseIISIntegration()
                 .UseStartup<Startup>()
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
index cb6c68c26a..aca56d5bbe 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
@@ -5,7 +5,6 @@ using System;
 using Microsoft.AspNetCore.Diagnostics.Elm;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -22,9 +21,12 @@ namespace Microsoft.AspNetCore.Builder
             }
 
             // add the elm provider to the factory here so the logger can start capturing logs immediately
-            var factory = app.ApplicationServices.GetRequiredService<ILoggerFactory>();
-            var provider = app.ApplicationServices.GetRequiredService<ElmLoggerProvider>();
-            factory.AddProvider(provider);
+            var factory = app.ApplicationServices.GetRequiredService<ILoggerFactory>() as LoggerFactory;
+            if (factory != null)
+            {
+                var provider = app.ApplicationServices.GetRequiredService<ElmLoggerProvider>();
+                factory.AddProvider(provider);
+            }
 
             return app.UseMiddleware<ElmCaptureMiddleware>();
         }
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
index 2e01074c8f..eab70f6ef6 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
@@ -17,9 +17,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <DotNetCliToolReference Include="RazorPageGenerator" Version="$(AspNetCoreVersion)" />
   </ItemGroup>