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 063b7848c..2421912da 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
@@ -94,11 +94,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             var pathBase = Configuration["PATH_BASE"];
 
-            app.UseSwagger()
-              .UseSwaggerUI(c =>
-              {
-                  c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "eShopDashboard.API V1");
-              });
+            app.UseSwagger();
+            if (app.Environment.IsDevelopment())
+            {
+                app.UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "eShopDashboard.API V1");
+                });
+            }
         }
     }
 }
diff --git a/samples/modelbuilder/MatrixFactorization_MovieRecommendation/MovieRecommender_WebApi/Program.cs b/samples/modelbuilder/MatrixFactorization_MovieRecommendation/MovieRecommender_WebApi/Program.cs
index edc9a6c00..00552109a 100644
--- a/samples/modelbuilder/MatrixFactorization_MovieRecommendation/MovieRecommender_WebApi/Program.cs
+++ b/samples/modelbuilder/MatrixFactorization_MovieRecommendation/MovieRecommender_WebApi/Program.cs
@@ -20,10 +20,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",