diff --git a/apps/mana/apps/web/src/lib/api/base-client.ts b/apps/mana/apps/web/src/lib/api/base-client.ts
index d6c26ccbf..9811a579c 100644
--- a/apps/mana/apps/web/src/lib/api/base-client.ts
+++ b/apps/mana/apps/web/src/lib/api/base-client.ts
@@ -104,7 +104,7 @@ export async function fetchWithRetry<T>(
 	for (let attempt = 0; attempt <= config.maxRetries; attempt++) {
 		try {
 			// Get fresh token for each attempt
-			const token = await authStore.getAccessToken();
+			const token = await authStore.getValidToken();
 
 			const response = await fetch(url, {
 				...options,
diff --git a/apps/mana/apps/web/src/lib/api/credits.ts b/apps/mana/apps/web/src/lib/api/credits.ts
index fb87744b3..025c38fe7 100644
--- a/apps/mana/apps/web/src/lib/api/credits.ts
+++ b/apps/mana/apps/web/src/lib/api/credits.ts
@@ -56,7 +56,7 @@ export interface CreditPurchase {
 
 // Helper function for authenticated requests
 async function fetchWithAuth<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 
 	const response = await fetch(`${getManaCreditsUrl()}${endpoint}`, {
 		...options,
diff --git a/apps/mana/apps/web/src/lib/api/feedback.ts b/apps/mana/apps/web/src/lib/api/feedback.ts
index f55b3916e..e07a31da7 100644
--- a/apps/mana/apps/web/src/lib/api/feedback.ts
+++ b/apps/mana/apps/web/src/lib/api/feedback.ts
@@ -9,5 +9,5 @@ import { getManaAuthUrl } from './config';
 export const feedbackService = createFeedbackService({
 	apiUrl: getManaAuthUrl(),
 	appId: 'mana',
-	getAuthToken: async () => authStore.getAccessToken(),
+	getAuthToken: async () => authStore.getValidToken(),
 });
diff --git a/apps/mana/apps/web/src/lib/api/gifts.ts b/apps/mana/apps/web/src/lib/api/gifts.ts
index 32e2dec03..35ba6a939 100644
--- a/apps/mana/apps/web/src/lib/api/gifts.ts
+++ b/apps/mana/apps/web/src/lib/api/gifts.ts
@@ -85,7 +85,7 @@ async function fetchPublic<T>(endpoint: string): Promise<T> {
 
 // Helper function for authenticated requests
 async function fetchWithAuth<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 
 	const response = await fetch(`${getManaAuthUrl()}${endpoint}`, {
 		...options,
diff --git a/apps/mana/apps/web/src/lib/api/profile.ts b/apps/mana/apps/web/src/lib/api/profile.ts
index fb71fd094..1ba48b6c4 100644
--- a/apps/mana/apps/web/src/lib/api/profile.ts
+++ b/apps/mana/apps/web/src/lib/api/profile.ts
@@ -41,7 +41,7 @@ export interface AvatarUploadUrlResponse {
 
 // Helper function for authenticated requests
 async function fetchWithAuth<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 
 	const response = await fetch(`${getManaAuthUrl()}${endpoint}`, {
 		...options,
diff --git a/apps/mana/apps/web/src/lib/api/research.ts b/apps/mana/apps/web/src/lib/api/research.ts
index 8105090ec..9dcc21eca 100644
--- a/apps/mana/apps/web/src/lib/api/research.ts
+++ b/apps/mana/apps/web/src/lib/api/research.ts
@@ -87,7 +87,7 @@ export class ResearchApiError extends Error {
 // ─── Internal helpers ───────────────────────────────────────
 
 async function authHeaders(extra: HeadersInit = {}): Promise<HeadersInit> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	return {
 		'Content-Type': 'application/json',
 		...(token ? { Authorization: `Bearer ${token}` } : {}),
diff --git a/apps/mana/apps/web/src/lib/api/services/my-data.ts b/apps/mana/apps/web/src/lib/api/services/my-data.ts
index b058c2be5..fd61e97dd 100644
--- a/apps/mana/apps/web/src/lib/api/services/my-data.ts
+++ b/apps/mana/apps/web/src/lib/api/services/my-data.ts
@@ -74,7 +74,7 @@ export const myDataService = {
 	 */
 	async downloadMyData(): Promise<void> {
 		const baseUrl = getAuthApiUrl();
-		const token = await authStore.getAccessToken();
+		const token = await authStore.getValidToken();
 
 		// Use fetch with blob response for file download
 		const response = await fetch(`${baseUrl}/me/data/export`, {
diff --git a/apps/mana/apps/web/src/lib/api/subscriptions.ts b/apps/mana/apps/web/src/lib/api/subscriptions.ts
index 070f14875..af62ea65f 100644
--- a/apps/mana/apps/web/src/lib/api/subscriptions.ts
+++ b/apps/mana/apps/web/src/lib/api/subscriptions.ts
@@ -57,7 +57,7 @@ export interface CurrentSubscription {
 
 // Helper function for authenticated requests
 async function fetchWithAuth<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 
 	const response = await fetch(`${getManaAuthUrl()}${endpoint}`, {
 		...options,
diff --git a/apps/mana/apps/web/src/lib/api/sync.ts b/apps/mana/apps/web/src/lib/api/sync.ts
index 5ca12deda..9ffe2d120 100644
--- a/apps/mana/apps/web/src/lib/api/sync.ts
+++ b/apps/mana/apps/web/src/lib/api/sync.ts
@@ -26,7 +26,7 @@ export interface SyncActivateResponse {
 
 // Helper
 async function fetchWithAuth<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 
 	const response = await fetch(`${getManaCreditsUrl()}${endpoint}`, {
 		...options,
diff --git a/apps/mana/apps/web/src/lib/data/crypto/vault-instance.ts b/apps/mana/apps/web/src/lib/data/crypto/vault-instance.ts
index df8b4e5eb..f3d05c2ae 100644
--- a/apps/mana/apps/web/src/lib/data/crypto/vault-instance.ts
+++ b/apps/mana/apps/web/src/lib/data/crypto/vault-instance.ts
@@ -26,7 +26,7 @@ export function getVaultClient(): VaultClient {
 	if (!_instance) {
 		_instance = createVaultClient({
 			authUrl: getManaAuthUrl(),
-			getToken: () => authStore.getAccessToken(),
+			getToken: () => authStore.getValidToken(),
 		});
 	}
 	return _instance;
diff --git a/apps/mana/apps/web/src/lib/modules/chat/services/completion.ts b/apps/mana/apps/web/src/lib/modules/chat/services/completion.ts
index 399119788..2a9244acc 100644
--- a/apps/mana/apps/web/src/lib/modules/chat/services/completion.ts
+++ b/apps/mana/apps/web/src/lib/modules/chat/services/completion.ts
@@ -58,7 +58,7 @@ async function resolveSystemPrompt(templateId: string | undefined): Promise<stri
  * Returns an empty object when no token is available (guest mode).
  */
 async function authHeader(): Promise<Record<string, string>> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	return token ? { Authorization: `Bearer ${token}` } : {};
 }
 
diff --git a/apps/mana/apps/web/src/lib/modules/events/api.ts b/apps/mana/apps/web/src/lib/modules/events/api.ts
index dec1e7644..3c69edb15 100644
--- a/apps/mana/apps/web/src/lib/modules/events/api.ts
+++ b/apps/mana/apps/web/src/lib/modules/events/api.ts
@@ -32,7 +32,7 @@ export interface PublicRsvpRecord {
 }
 
 async function fetchWithAuth<T>(path: string, init: RequestInit = {}): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	const res = await fetch(`${getManaEventsUrl()}${path}`, {
 		...init,
 		headers: {
diff --git a/apps/mana/apps/web/src/lib/modules/music/ListView.svelte b/apps/mana/apps/web/src/lib/modules/music/ListView.svelte
index bb4880779..b9762c60d 100644
--- a/apps/mana/apps/web/src/lib/modules/music/ListView.svelte
+++ b/apps/mana/apps/web/src/lib/modules/music/ListView.svelte
@@ -121,7 +121,7 @@
 		if (uploading) return;
 		uploading = true;
 
-		const token = await authStore.getAccessToken();
+		const token = await authStore.getValidToken();
 
 		for (let i = 0; i < uploadFiles.length; i++) {
 			if (uploadFiles[i]!.status !== 'pending') continue;
diff --git a/apps/mana/apps/web/src/lib/modules/nutriphi/api.ts b/apps/mana/apps/web/src/lib/modules/nutriphi/api.ts
index 8d9d29729..d2d5b7829 100644
--- a/apps/mana/apps/web/src/lib/modules/nutriphi/api.ts
+++ b/apps/mana/apps/web/src/lib/modules/nutriphi/api.ts
@@ -49,7 +49,7 @@ export interface UploadMealPhotoResult {
 }
 
 async function authHeader(): Promise<Record<string, string>> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	return token ? { Authorization: `Bearer ${token}` } : {};
 }
 
diff --git a/apps/mana/apps/web/src/lib/modules/plants/api.ts b/apps/mana/apps/web/src/lib/modules/plants/api.ts
index 2c57b61bd..5cc4d3fac 100644
--- a/apps/mana/apps/web/src/lib/modules/plants/api.ts
+++ b/apps/mana/apps/web/src/lib/modules/plants/api.ts
@@ -43,7 +43,7 @@ export interface UploadPhotoResult {
 }
 
 async function authHeader(): Promise<Record<string, string>> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	return token ? { Authorization: `Bearer ${token}` } : {};
 }
 
diff --git a/apps/mana/apps/web/src/lib/modules/who/ListView.svelte b/apps/mana/apps/web/src/lib/modules/who/ListView.svelte
index 8784b5368..13ae32f9a 100644
--- a/apps/mana/apps/web/src/lib/modules/who/ListView.svelte
+++ b/apps/mana/apps/web/src/lib/modules/who/ListView.svelte
@@ -33,7 +33,7 @@
 
 	onMount(async () => {
 		try {
-			const token = await authStore.getAccessToken();
+			const token = await authStore.getValidToken();
 			if (!token) {
 				loadingDecks = false;
 				return;
diff --git a/apps/mana/apps/web/src/lib/modules/who/stores/games.svelte.ts b/apps/mana/apps/web/src/lib/modules/who/stores/games.svelte.ts
index 3245ccfc6..17b32cf28 100644
--- a/apps/mana/apps/web/src/lib/modules/who/stores/games.svelte.ts
+++ b/apps/mana/apps/web/src/lib/modules/who/stores/games.svelte.ts
@@ -48,7 +48,7 @@ const API_BASE = '/api/v1/who';
  * Same pattern as base-client.ts uses for every other API call.
  */
 async function postJson<T>(path: string, body: unknown): Promise<T> {
-	const token = await authStore.getAccessToken();
+	const token = await authStore.getValidToken();
 	if (!token) {
 		guestPrompt.requireAccount(
 			'who',
diff --git a/apps/mana/apps/web/src/lib/stores/user-settings.svelte.ts b/apps/mana/apps/web/src/lib/stores/user-settings.svelte.ts
index 94361f749..4e63d1c35 100644
--- a/apps/mana/apps/web/src/lib/stores/user-settings.svelte.ts
+++ b/apps/mana/apps/web/src/lib/stores/user-settings.svelte.ts
@@ -24,5 +24,5 @@ function getAuthUrl(): string {
 export const userSettings = createUserSettingsStore({
 	appId: 'mana',
 	authUrl: getAuthUrl,
-	getAccessToken: () => authStore.getAccessToken(),
+	getAccessToken: () => authStore.getValidToken(),
 });