diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
index 9bc365ff..584049e6 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs
@@ -391,10 +391,19 @@ try
     }
 
     var useSwagger = app.Environment.IsDevelopment() || config.GetValue<bool>("UseSwagger");
+    var useScalar = app.Environment.IsDevelopment() || config.GetValue<bool>("UseScalar");
+
     if (useSwagger)
     {
         app.UseSwagger();
         app.UseSwaggerUI();
+    }
+
+    if (useScalar)
+    {
+        if (!useSwagger)
+            app.UseSwagger(); // Scalar requires the OpenAPI JSON endpoint
+
         app.MapScalarApiReference();
     }
 
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json
index bba7a285..9dadd643 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json
@@ -1,5 +1,6 @@
 {
   "UseSwagger": true,
+  "UseScalar": true,
   "UseDbMigration": false,
   "DiPMode": true,
   "Logging": {