diff --git a/api/HostingExtensions.cs b/api/HostingExtensions.cs
index 3c0e56e..a69434d 100644
--- a/api/HostingExtensions.cs
+++ b/api/HostingExtensions.cs
@@ -15,8 +15,6 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
         var configuration = builder.Configuration;
         _env = builder.Environment;
 
-        JsonWebTokenHandler.DefaultInboundClaimTypeMap.Clear();
-
         var stsServer = configuration["StsServer"];
 
         services.AddAuthentication("dpoptokenscheme")
@@ -82,7 +80,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
     
     public static WebApplication ConfigurePipeline(this WebApplication app)
     {
-        IdentityModelEventSource.ShowPII = true;
+        IdentityModelEventSource.ShowPII = true;
+        JsonWebTokenHandler.DefaultInboundClaimTypeMap.Clear();
 
         app.UseSerilogRequestLogging();