diff --git a/client/pages/SubdomainPassport.tsx b/client/pages/SubdomainPassport.tsx
index 10d7e625..3a741983 100644
--- a/client/pages/SubdomainPassport.tsx
+++ b/client/pages/SubdomainPassport.tsx
@@ -106,6 +106,16 @@ const SubdomainPassport = () => {
         setLoading(true);
         setError(null);
 
+        // Check if server pre-fetched the data (for SSR)
+        const preloadedData = (window as any).__PASSPORT_DATA__;
+        if (preloadedData) {
+          console.log("[SubdomainPassport] Using pre-fetched server data");
+          setData(preloadedData);
+          setLoading(false);
+          return;
+        }
+
+        // Fallback to API call if no preloaded data
         const apiBase = getApiBase();
         if (!apiBase) {
           setError("Cannot determine API base");