diff --git a/README.md b/README.md
index 87f94ae84..655b186e6 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 
 ![](img/eshop-webmvc-app-screenshot.png)
 
-## Azure DevOps - Build Status 
+## Azure DevOps - Build Status
 
 | Image | Status | Image | Status |
 | ------------- | ------------- | ------------- | ------------- |
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index ee4c04641..3ccf16d54 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -91,6 +91,14 @@
 
             app.UseCors("CorsPolicy");
 
+            app.UseSwagger()
+               .UseSwaggerUI(c =>
+               {
+                   c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Ordering.API V1");
+                   c.OAuthClientId("orderingswaggerui");
+                   c.OAuthAppName("Ordering Swagger UI");
+               });
+
             app.UseRouting();
             ConfigureAuth(app);
 
@@ -124,14 +132,6 @@
                 });
             });
 
-            app.UseSwagger()
-               .UseSwaggerUI(c =>
-               {
-                   c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Ordering.API V1");
-                   c.OAuthClientId("orderingswaggerui");
-                   c.OAuthAppName("Ordering Swagger UI");
-               });
-
             ConfigureEventBus(app);
         }