diff --git a/src/app/admin/pool-management/manage/page.tsx b/src/app/admin/pool-management/manage/page.tsx
index 45f8e64..ffd597d 100644
--- a/src/app/admin/pool-management/manage/page.tsx
+++ b/src/app/admin/pool-management/manage/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import React from 'react'
+import React, { Suspense } from 'react' // CHANGED: add Suspense
 import Header from '../../../components/nav/Header'
 import Footer from '../../../components/Footer'
 import { UsersIcon, PlusIcon, BanknotesIcon, CalendarDaysIcon, MagnifyingGlassIcon, XMarkIcon } from '@heroicons/react/24/outline'
@@ -16,7 +16,7 @@ type PoolUser = {
   joinedAt: string // NEW: member since
 }
 
-export default function PoolManagePage() {
+function PoolManagePageInner() {
   const router = useRouter()
   const searchParams = useSearchParams()
   const user = useAuthStore(s => s.user)
@@ -350,4 +350,22 @@ export default function PoolManagePage() {
       </div>
     </PageTransitionEffect>
   )
+}
+
+// CHANGED: Suspense wrapper required for useSearchParams() during prerender
+export default function PoolManagePage() {
+  return (
+    <Suspense
+      fallback={
+        <div className="min-h-screen flex items-center justify-center">
+          <div className="text-center">
+            <div className="animate-spin rounded-full h-10 w-10 border-b-2 border-[#0F172A] mx-auto mb-3" />
+            <p className="text-[#4A4A4A]">Loading...</p>
+          </div>
+        </div>
+      }
+    >
+      <PoolManagePageInner />
+    </Suspense>
+  )
 }
\ No newline at end of file
diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx
index 399aae0..72458ab 100644
--- a/src/app/register/page.tsx
+++ b/src/app/register/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState, type CSSProperties } from 'react'
+import { useEffect, useState, type CSSProperties, Suspense } from 'react' // CHANGED: add Suspense
 import { useSearchParams, useRouter } from 'next/navigation'
 import useAuthStore from '../store/authStore'
 import RegisterForm from './components/RegisterForm'
@@ -326,7 +326,20 @@ function RegisterPageInner() {
 export default function RegisterPage() {
   return (
     <ToastProvider>
-      <RegisterPageInner />
+      <Suspense
+        fallback={
+          <PageLayout>
+            <div className="min-h-screen flex items-center justify-center">
+              <div className="text-center">
+                <div className="animate-spin rounded-full h-10 w-10 border-2 border-b-transparent border-[#8D6B1D] mx-auto mb-3" />
+                <p className="text-[#4A4A4A]">Loading...</p>
+              </div>
+            </div>
+          </PageLayout>
+        }
+      >
+        <RegisterPageInner />
+      </Suspense>
     </ToastProvider>
   )
 }
\ No newline at end of file