diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs
index 4993a380b7..946ca62139 100644
--- a/src/Core/Context/CurrentContext.cs
+++ b/src/Core/Context/CurrentContext.cs
@@ -134,6 +134,8 @@ public class CurrentContext : ICurrentContext
 
         var claimsDict = user.Claims.GroupBy(c => c.Type).ToDictionary(c => c.Key, c => c.Select(v => v));
 
+        ClientId = GetClaimValue(claimsDict, "client_id");
+
         var clientType = GetClaimValue(claimsDict, Claims.Type);
         if (clientType != null)
         {
@@ -160,7 +162,6 @@ public class CurrentContext : ICurrentContext
             UserId = subIdGuid;
         }
 
-        ClientId = GetClaimValue(claimsDict, "client_id");
         var clientSubject = GetClaimValue(claimsDict, "client_sub");
         var orgApi = false;
         if (clientSubject != null)
@@ -182,8 +183,6 @@ public class CurrentContext : ICurrentContext
             }
         }
 
-
-
         DeviceIdentifier = GetClaimValue(claimsDict, Claims.Device);
 
         if (Enum.TryParse(GetClaimValue(claimsDict, Claims.DeviceType), out DeviceType deviceType))