diff --git a/apps/web/app/(dashboard)/servers/new/page.tsx b/apps/web/app/(dashboard)/servers/new/page.tsx
index 3479ed1..7b87977 100644
--- a/apps/web/app/(dashboard)/servers/new/page.tsx
+++ b/apps/web/app/(dashboard)/servers/new/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { Suspense, useEffect, useState } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { apiFetch } from '@/lib/api';
 import { Button } from '@/components/ui/button';
@@ -82,7 +82,7 @@ function specToEditable(spec: PreviewResponse['spec']): EditableSpec {
   };
 }
 
-export default function NewServerPage() {
+function NewServerPageInner() {
   const router = useRouter();
   const [step, setStep] = useState<Step>('prompt');
 
@@ -708,6 +708,26 @@ export default function NewServerPage() {
   );
 }
 
+// useSearchParams() forces client-side rendering — Next requires a Suspense
+// boundary around it, or `next build` bails out of static generation.
+export default function NewServerPage() {
+  return (
+    <Suspense
+      fallback={
+        <div className="mx-auto max-w-3xl px-6 py-8">
+          <h1 className="text-[22px] font-semibold tracking-tight">New MCP server</h1>
+          <div className="panel mt-10 p-8 text-center">
+            <Loader2 className="mx-auto animate-spin text-[--color-fg-muted]" size={20} />
+            <p className="mt-4 text-[13px] text-[--color-fg-muted]">Loading…</p>
+          </div>
+        </div>
+      }
+    >
+      <NewServerPageInner />
+    </Suspense>
+  );
+}
+
 const SHARE_CATEGORIES = [
   'productivity',
   'developer-tools',
diff --git a/apps/web/app/login/callback/page.tsx b/apps/web/app/login/callback/page.tsx
index 6c1e1ea..1ae25b1 100644
--- a/apps/web/app/login/callback/page.tsx
+++ b/apps/web/app/login/callback/page.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { Suspense, useEffect, useState } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { Logo } from '@/components/logo';
 import { apiFetch } from '@/lib/api';
 
-export default function CallbackPage() {
+function CallbackInner() {
   const router = useRouter();
   const params = useSearchParams();
   const token = params.get('token');
@@ -53,3 +53,19 @@ export default function CallbackPage() {
     </div>
   );
 }
+
+// useSearchParams() requires a Suspense boundary or `next build` cannot
+// statically render this route.
+export default function CallbackPage() {
+  return (
+    <Suspense
+      fallback={
+        <div className="flex min-h-screen items-center justify-center px-6">
+          <p className="text-[13px] text-[--color-fg-muted]">Verifying your magic link…</p>
+        </div>
+      }
+    >
+      <CallbackInner />
+    </Suspense>
+  );
+}