diff --git a/src/app/ClientPage.tsx b/src/app/ClientPage.tsx
index ab637be..0d1cbf6 100644
--- a/src/app/ClientPage.tsx
+++ b/src/app/ClientPage.tsx
@@ -1,9 +1,8 @@
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import dynamic from 'next/dynamic';
 import { AppData } from '@/lib/types';
-import { defaultAppData } from '@/lib/defaultData';
 import { calculateStandingsData } from '@/lib/leaderboard';
 import RaceResultsTable from './components/RaceResultsTable';
 import DriverStandings from './components/DriverStandings';
@@ -11,40 +10,12 @@ import PointsKey from './components/PointsKey';
 
 const CumulativeChart = dynamic(() => import('./components/CumulativeChart'), { ssr: false });
 
-const API_BASE = process.env.NEXT_PUBLIC_API_BASE || '';
-const SERVER_ID = process.env.NEXT_PUBLIC_SERVER_ID || '';
-const ACCESS_TOKEN = process.env.NEXT_PUBLIC_ACCESS_TOKEN || '';
-
-async function fetchLeaderboard(): Promise<AppData | null> {
-  try {
-    const res = await fetch(`${API_BASE}/server/${SERVER_ID}/leaderboard`, {
-      headers: {
-        "Access-Key": ACCESS_TOKEN
-      }
-    });
-    if (!res.ok) return null;
-    const data = await res.json();
-    // Treat empty leaderboard (no drivers) as null to fall back to defaults
-    if (!data || !data.drivers || data.drivers.length === 0) return null;
-    return data;
-  } catch (e) {
-    console.error("Failed to load leaderboard from API:", e);
-    return null;
-  }
+interface ClientPageProps {
+  initialAppData: AppData;
 }
 
-export default function ClientPage() {
-  const [appData, setAppData] = useState<AppData>(defaultAppData);
-
-  useEffect(() => {
-    const loadData = async () => {
-      const savedData = await fetchLeaderboard();
-      if (savedData) {
-        setAppData(savedData);
-      }
-    };
-    loadData();
-  }, []);
+export default function ClientPage({ initialAppData }: ClientPageProps) {
+  const appData = initialAppData;
 
   const standingsData = useMemo(() => calculateStandingsData(appData), [appData]);
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index becd00d..bdaba21 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,5 +1,10 @@
+import { fetchLeaderboard } from '@/lib/api';
+import { defaultAppData } from '@/lib/defaultData';
 import ClientPage from './ClientPage';
 
-export default function Page() {
-  return <ClientPage />;
+export default async function Page() {
+  const leaderboardData = await fetchLeaderboard();
+  const initialAppData = leaderboardData || defaultAppData;
+
+  return <ClientPage initialAppData={initialAppData} />;
 }
diff --git a/src/lib/api.ts b/src/lib/api.ts
new file mode 100644
index 0000000..ac973aa
--- /dev/null
+++ b/src/lib/api.ts
@@ -0,0 +1,28 @@
+import { AppData } from './types';
+
+export async function fetchLeaderboard(): Promise<AppData | null> {
+  const API_BASE = process.env.NEXT_PUBLIC_API_BASE || '';
+  const SERVER_ID = process.env.NEXT_PUBLIC_SERVER_ID || '';
+  const ACCESS_TOKEN = process.env.NEXT_PUBLIC_ACCESS_TOKEN || '';
+
+  if (!API_BASE || !SERVER_ID || !ACCESS_TOKEN) {
+    console.warn('Missing API configuration');
+    return null;
+  }
+
+  try {
+    const res = await fetch(`${API_BASE}/server/${SERVER_ID}/leaderboard`, {
+      headers: {
+        "Access-Key": ACCESS_TOKEN
+      }
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    // Treat empty leaderboard (no drivers) as null to fall back to defaults
+    if (!data || !data.drivers || data.drivers.length === 0) return null;
+    return data;
+  } catch (e) {
+    console.error("Failed to load leaderboard from API:", e);
+    return null;
+  }
+}