diff --git a/src/webapp/api-client/ApiClient.ts b/src/webapp/api-client/ApiClient.ts
index 9d0b0b3b..5209ba4d 100644
--- a/src/webapp/api-client/ApiClient.ts
+++ b/src/webapp/api-client/ApiClient.ts
@@ -278,7 +278,9 @@ export const createApiClient = () => {
 };
 
 export const createServerApiClient = () => {
-  return new ApiClient(process.env.API_BASE_URL || 'http://127.0.0.1:3000');
+  return new ApiClient(
+    process.env.NEXT_PUBLIC_API_BASE_URL || 'http://127.0.0.1:3000',
+  );
 };
 
 // Default client instance for backward compatibility
diff --git a/src/webapp/lib/serverAuth.ts b/src/webapp/lib/serverAuth.ts
index 14126989..5bd8567b 100644
--- a/src/webapp/lib/serverAuth.ts
+++ b/src/webapp/lib/serverAuth.ts
@@ -20,7 +20,8 @@ export async function getServerAuthStatus(): Promise<{
     }
 
     // Make direct API call with cookie header for server-side
-    const baseUrl = process.env.API_BASE_URL || 'http://127.0.0.1:3000';
+    const baseUrl =
+      process.env.NEXT_PUBLIC_API_BASE_URL || 'http://127.0.0.1:3000';
     const response = await fetch(`${baseUrl}/api/users/me`, {
       method: 'GET',
       headers: {