diff --git a/EnvelopeGenerator.API/Program.cs b/EnvelopeGenerator.API/Program.cs
index f2478083..e7d29141 100644
--- a/EnvelopeGenerator.API/Program.cs
+++ b/EnvelopeGenerator.API/Program.cs
@@ -322,9 +322,19 @@ try
     app.UseAuthentication();
     app.UseAuthorization();
 
-    app.MapReverseProxy();
     app.MapControllers();
 
+    // Catch-all YARP proxy — only forward requests that are not swagger/scalar/openapi paths.
+    app.MapWhen(
+        ctx =>
+        {
+            var path = ctx.Request.Path.Value ?? string.Empty;
+            return !path.StartsWith("/swagger", StringComparison.OrdinalIgnoreCase) &&
+                   !path.StartsWith("/scalar", StringComparison.OrdinalIgnoreCase) &&
+                   !path.StartsWith("/openapi", StringComparison.OrdinalIgnoreCase);
+        },
+        branch => branch.UseRouting().UseEndpoints(e => e.MapReverseProxy()));
+
     app.Run();
 }
 catch (Exception ex)