diff --git a/package-lock.json b/package-lock.json
index 2182c45285..41139b1512 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "@flanksource/flanksource-ui",
-      "version": "1.4.218",
+      "version": "1.4.224",
       "dependencies": {
         "@ai-sdk/anthropic": "^3.0.1",
         "@ai-sdk/mcp": "^1.0.1",
diff --git a/src/components/Authentication/Kratos/KratosAuthContextProvider.tsx b/src/components/Authentication/Kratos/KratosAuthContextProvider.tsx
index c5d3e260c3..b310501913 100644
--- a/src/components/Authentication/Kratos/KratosAuthContextProvider.tsx
+++ b/src/components/Authentication/Kratos/KratosAuthContextProvider.tsx
@@ -39,6 +39,10 @@ export default function KratosAuthContextProvider({ children }: Props) {
     return <ErrorPage error={error} />;
   }
 
+  if (!payload) {
+    return <FullPageSkeletonLoader />;
+  }
+
   return (
     <AuthContext.Provider
       value={{
diff --git a/src/context/index.ts b/src/context/index.ts
index 4992cc8c5e..661052a27e 100644
--- a/src/context/index.ts
+++ b/src/context/index.ts
@@ -18,7 +18,7 @@ export function createAuthorizer(ctx: WhoamiResponse["payload"]): Authorizer {
   const authorizer = new casbinAuthorizer("manual");
   const builtPerms: Record<string, any> = {};
 
-  ctx.roles.forEach((role) => {
+  (ctx.roles ?? []).forEach((role) => {
     const permissions = permDefs[role as keyof typeof permDefs] ?? {};
     Object.entries(permissions).forEach(([key, value]) => {
       builtPerms[key] = [...(builtPerms[key] || []), ...value];