diff --git a/ui/homepage/app/logout/LogoutClient.tsx b/ui/homepage/app/logout/LogoutClient.tsx
new file mode 100644
index 0000000..2cfb2d2
--- /dev/null
+++ b/ui/homepage/app/logout/LogoutClient.tsx
@@ -0,0 +1,77 @@
+'use client'
+
+import { useEffect } from 'react'
+import { useRouter } from 'next/navigation'
+
+import Navbar from '@components/Navbar'
+import Footer from '@components/Footer'
+import { AskAIButton } from '@components/AskAIButton'
+import { useLanguage } from '@i18n/LanguageProvider'
+import { translations } from '@i18n/translations'
+import { useUser } from '@lib/userStore'
+
+export function LogoutClient() {
+  const router = useRouter()
+  const { logout } = useUser()
+  const { language } = useLanguage()
+  const navCopy = translations[language].nav.account
+  const signingOutMessage = language === 'zh' ? '正在安全退出，请稍候…' : 'Signing you out safely. One moment…'
+
+  useEffect(() => {
+    let cancelled = false
+
+    const performLogout = async () => {
+      try {
+        await logout()
+      } finally {
+        if (!cancelled) {
+          router.replace('/')
+          router.refresh()
+        }
+      }
+    }
+
+    void performLogout()
+
+    return () => {
+      cancelled = true
+    }
+  }, [logout, router])
+
+  return (
+    <div className="flex min-h-screen flex-col bg-gray-50">
+      <Navbar />
+      <main className="flex flex-1 items-center justify-center px-4 pb-16 pt-28 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md rounded-3xl bg-white p-10 text-center shadow-xl ring-1 ring-gray-100">
+          <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-purple-100 text-purple-600">
+            <svg
+              aria-hidden
+              className="h-6 w-6 animate-spin"
+              viewBox="0 0 24 24"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <circle
+                className="opacity-25"
+                cx="12"
+                cy="12"
+                r="10"
+                stroke="currentColor"
+                strokeWidth="4"
+              />
+              <path
+                className="opacity-75"
+                fill="currentColor"
+                d="M4 12a8 8 0 018-8v4a4 4 0 00-4 4H4z"
+              />
+            </svg>
+          </div>
+          <h1 className="mt-6 text-2xl font-semibold text-gray-900">{navCopy.logout}</h1>
+          <p className="mt-3 text-sm text-gray-600">{signingOutMessage}</p>
+        </div>
+      </main>
+      <Footer />
+      <AskAIButton />
+    </div>
+  )
+}
diff --git a/ui/homepage/app/logout/page.tsx b/ui/homepage/app/logout/page.tsx
index 2e90b79..e0e1b81 100644
--- a/ui/homepage/app/logout/page.tsx
+++ b/ui/homepage/app/logout/page.tsx
@@ -1,76 +1,23 @@
-'use client'
+import { Suspense } from 'react'
 
-import { useEffect } from 'react'
-import { useRouter } from 'next/navigation'
-
-import Navbar from '@components/Navbar'
-import Footer from '@components/Footer'
-import { AskAIButton } from '@components/AskAIButton'
-import { useLanguage } from '@i18n/LanguageProvider'
-import { translations } from '@i18n/translations'
-import { useUser } from '@lib/userStore'
-
-export default function LogoutPage() {
-  const router = useRouter()
-  const { logout } = useUser()
-  const { language } = useLanguage()
-  const navCopy = translations[language].nav.account
-  const signingOutMessage = language === 'zh' ? '正在安全退出，请稍候…' : 'Signing you out safely. One moment…'
-
-  useEffect(() => {
-    let cancelled = false
-    const performLogout = async () => {
-      try {
-        await logout()
-      } finally {
-        if (!cancelled) {
-          router.replace('/')
-          router.refresh()
-        }
-      }
-    }
-
-    void performLogout()
-
-    return () => {
-      cancelled = true
-    }
-  }, [logout, router])
+import { LogoutClient } from './LogoutClient'
 
+function LogoutFallback() {
   return (
     <div className="flex min-h-screen flex-col bg-gray-50">
-      <Navbar />
       <main className="flex flex-1 items-center justify-center px-4 pb-16 pt-28 sm:px-6 lg:px-8">
         <div className="w-full max-w-md rounded-3xl bg-white p-10 text-center shadow-xl ring-1 ring-gray-100">
-          <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-purple-100 text-purple-600">
-            <svg
-              aria-hidden
-              className="h-6 w-6 animate-spin"
-              viewBox="0 0 24 24"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <circle
-                className="opacity-25"
-                cx="12"
-                cy="12"
-                r="10"
-                stroke="currentColor"
-                strokeWidth="4"
-              />
-              <path
-                className="opacity-75"
-                fill="currentColor"
-                d="M4 12a8 8 0 018-8v4a4 4 0 00-4 4H4z"
-              />
-            </svg>
-          </div>
-          <h1 className="mt-6 text-2xl font-semibold text-gray-900">{navCopy.logout}</h1>
-          <p className="mt-3 text-sm text-gray-600">{signingOutMessage}</p>
+          <div className="mx-auto h-12 w-12 animate-spin rounded-full border-4 border-purple-200 border-t-transparent" />
         </div>
       </main>
-      <Footer />
-      <AskAIButton />
     </div>
   )
 }
+
+export default function LogoutPage() {
+  return (
+    <Suspense fallback={<LogoutFallback />}>
+      <LogoutClient />
+    </Suspense>
+  )
+}