diff --git a/src/features/players/server.ts b/src/features/players/server.ts
index ebb8359..3f2e400 100644
--- a/src/features/players/server.ts
+++ b/src/features/players/server.ts
@@ -10,6 +10,7 @@ export const fetchMe = createServerFn().handler(async () => {
   if (!data || !data.userAuthId) return { user: undefined, roles: [], metadata: {} };
 
   try {
+    await pbAdmin.authPromise;
     const result = await pbAdmin.getPlayerByAuthId(data.userAuthId);
     logger.info('Fetched player', result);
     return {
diff --git a/src/lib/pocketbase/client.ts b/src/lib/pocketbase/client.ts
index 0945023..80eaab0 100644
--- a/src/lib/pocketbase/client.ts
+++ b/src/lib/pocketbase/client.ts
@@ -5,7 +5,7 @@ import { createTeamsService } from './services/teams';
 
 class PocketBaseAdminClient {
   private pb: PocketBase;
-  private authPromise: Promise<void>;
+  public authPromise: Promise<void>;
 
   constructor() {
     this.pb = new PocketBase(import.meta.env.VITE_POCKETBASE_URL);
@@ -44,6 +44,8 @@ interface AdminClient extends
   PocketBaseAdminClient,
   ReturnType<typeof createPlayersService>,
   ReturnType<typeof createTeamsService>,
-  ReturnType<typeof createTournamentsService> {}
+  ReturnType<typeof createTournamentsService> {
+  authPromise: Promise<void>;
+}
 
 export const pbAdmin = new PocketBaseAdminClient() as AdminClient;