diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
index d8de46d4..9bc365ff 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
@@ -383,9 +383,6 @@ try
     if (app.Environment.IsDevelopment())
     {
         app.UseWebAssemblyDebugging();
-        app.UseSwagger();
-        app.UseSwaggerUI();
-        app.MapScalarApiReference();
     }
     else
     {
@@ -393,6 +390,14 @@ try
         app.UseHsts();
     }
 
+    var useSwagger = app.Environment.IsDevelopment() || config.GetValue<bool>("UseSwagger");
+    if (useSwagger)
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI();
+        app.MapScalarApiReference();
+    }
+
     // Set CORS policy
     app.UseCors("AllowSpecificOriginsPolicy");