diff --git a/src/MusicStore.Standalone/Program.cs b/src/MusicStore.Standalone/Program.cs
index e4487c597d..eaeec66b87 100644
--- a/src/MusicStore.Standalone/Program.cs
+++ b/src/MusicStore.Standalone/Program.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Net.Http.Server;
@@ -22,7 +23,8 @@ namespace MusicStore.Standalone
                 .UseStartup("MusicStore.Standalone");
 
             if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.WebListener", System.StringComparison.Ordinal)
-                && string.Equals(builder.GetSetting("environment"), "NtlmAuthentication", System.StringComparison.Ordinal))
+                && string.Equals(builder.GetSetting("environment") ??
+                Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"), "NtlmAuthentication", System.StringComparison.Ordinal))
             {
                 // Set up NTLM authentication for WebListener like below.
                 // For IIS and IISExpress: Use inetmgr to setup NTLM authentication on the application vDir or
diff --git a/src/MusicStore/Program.cs b/src/MusicStore/Program.cs
index 0117de8799..00581eb8ba 100644
--- a/src/MusicStore/Program.cs
+++ b/src/MusicStore/Program.cs
@@ -21,7 +21,9 @@ namespace MusicStore
             // Switch beteween Kestrel and WebListener for different tests. Default to Kestrel for normal app execution.
             if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.WebListener", System.StringComparison.Ordinal))
             {
-                if (string.Equals(builder.GetSetting("environment"), "NtlmAuthentication", System.StringComparison.Ordinal))
+                if (string.Equals(builder.GetSetting("environment") ??
+                Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"),
+                "NtlmAuthentication", System.StringComparison.Ordinal))
                 {
                     // Set up NTLM authentication for WebListener as follows.
                     // For IIS and IISExpress use inetmgr to setup NTLM authentication on the application or