diff --git a/samples/csharp/end-to-end-apps/Forecasting-Sales/src/eShopDashboard/Startup.cs b/samples/csharp/end-to-end-apps/Forecasting-Sales/src/eShopDashboard/Startup.cs
index 2421912da..fa1681154 100644
--- a/samples/csharp/end-to-end-apps/Forecasting-Sales/src/eShopDashboard/Startup.cs
+++ b/samples/csharp/end-to-end-apps/Forecasting-Sales/src/eShopDashboard/Startup.cs
@@ -95,7 +95,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             var pathBase = Configuration["PATH_BASE"];
 
             app.UseSwagger();
-            if (app.Environment.IsDevelopment())
+            if (env.IsDevelopment())
             {
                 app.UseSwaggerUI(c =>
                 {
diff --git a/samples/modelbuilder/ImageClassification_Azure_LandUse/LandUse_WebApi/Program.cs b/samples/modelbuilder/ImageClassification_Azure_LandUse/LandUse_WebApi/Program.cs
index 5ce0cdc68..b23d56c3a 100644
--- a/samples/modelbuilder/ImageClassification_Azure_LandUse/LandUse_WebApi/Program.cs
+++ b/samples/modelbuilder/ImageClassification_Azure_LandUse/LandUse_WebApi/Program.cs
@@ -1,5 +1,6 @@
-// This file was auto-generated by ML.NET Model Builder. 
+// This file was auto-generated by ML.NET Model Builder. 
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.ML;
 using Microsoft.OpenApi.Models;
@@ -20,10 +21,13 @@
 
 app.UseSwagger();
 
-app.UseSwaggerUI(c =>
+if (app.Environment.IsDevelopment())
 {
-    c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
-});
+    app.UseSwaggerUI(c =>
+    {
+        c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
+    });
+}
 
 // Define prediction route & handler
 app.MapPost("/predict",
@@ -32,4 +36,3 @@
 
 // Run app
 app.Run();
-