diff --git a/src/Duende.Bff/EndpointServices/User/DefaultUserService.cs b/src/Duende.Bff/EndpointServices/User/DefaultUserService.cs
index 105dbc32..01bff8b2 100644
--- a/src/Duende.Bff/EndpointServices/User/DefaultUserService.cs
+++ b/src/Duende.Bff/EndpointServices/User/DefaultUserService.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -71,8 +72,8 @@ public virtual async Task ProcessRequestAsync(HttpContext context)
         else
         {
             var claims = new List<ClaimRecord>();
-            claims.AddRange(GetUserClaims(result));
-            claims.AddRange(GetManagementClaims(context, result));
+            claims.AddRange(await GetUserClaimsAsync(result));
+            claims.AddRange(await GetManagementClaimsAsync(context, result));
 
             var json = JsonSerializer.Serialize(claims);
 
@@ -89,9 +90,9 @@ public virtual async Task ProcessRequestAsync(HttpContext context)
     /// </summary>
     /// <param name="authenticateResult"></param>
     /// <returns></returns>
-    protected virtual IEnumerable<ClaimRecord> GetUserClaims(AuthenticateResult authenticateResult)
+    protected virtual ValueTask<IEnumerable<ClaimRecord>> GetUserClaimsAsync(AuthenticateResult authenticateResult)
     {
-        return authenticateResult.Principal?.Claims.Select(x => new ClaimRecord(x.Type, x.Value)) ?? Enumerable.Empty<ClaimRecord>();
+        return ValueTask.FromResult(authenticateResult.Principal?.Claims.Select(x => new ClaimRecord(x.Type, x.Value)) ?? Enumerable.Empty<ClaimRecord>());
     }
 
     /// <summary>
@@ -100,7 +101,7 @@ protected virtual IEnumerable<ClaimRecord> GetUserClaims(AuthenticateResult auth
     /// <param name="context"></param>
     /// <param name="authenticateResult"></param>
     /// <returns></returns>
-    protected virtual IEnumerable<ClaimRecord> GetManagementClaims(HttpContext context, AuthenticateResult authenticateResult)
+    protected virtual ValueTask<IEnumerable<ClaimRecord>> GetManagementClaimsAsync(HttpContext context, AuthenticateResult authenticateResult)
     {
         var claims = new List<ClaimRecord>();
 
@@ -131,7 +132,7 @@ protected virtual IEnumerable<ClaimRecord> GetManagementClaims(HttpContext conte
             }
         }
 
-        return claims;
+        return ValueTask.FromResult(claims as IEnumerable<ClaimRecord>);
     }
         
     /// <summary>