diff --git a/apps/web/app/(auth)/login/page.tsx b/apps/web/app/(auth)/login/page.tsx
index 222891e8..3d76dd87 100644
--- a/apps/web/app/(auth)/login/page.tsx
+++ b/apps/web/app/(auth)/login/page.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { useState } from "react";
+import { Suspense, useState } from "react";
 import { useSearchParams } from "next/navigation";
 import { useAuth } from "../../../lib/auth-context";
 
-export default function LoginPage() {
+function LoginPageContent() {
   const { login, isLoading } = useAuth();
   const searchParams = useSearchParams();
   const [email, setEmail] = useState("");
@@ -65,3 +65,11 @@ export default function LoginPage() {
     </div>
   );
 }
+
+export default function LoginPage() {
+  return (
+    <Suspense fallback={null}>
+      <LoginPageContent />
+    </Suspense>
+  );
+}
diff --git a/apps/web/app/pair/local/page.tsx b/apps/web/app/pair/local/page.tsx
index 79234b5b..023496d9 100644
--- a/apps/web/app/pair/local/page.tsx
+++ b/apps/web/app/pair/local/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { useEffect, useMemo, useState } from "react";
+import { Suspense, useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "next/navigation";
 import type { DaemonPairingSession } from "@multica/types";
 import { api } from "../../../lib/api";
@@ -16,7 +16,7 @@ function formatExpiresAt(value: string) {
   });
 }
 
-export default function LocalDaemonPairPage() {
+function LocalDaemonPairPageContent() {
   const searchParams = useSearchParams();
   const token = searchParams.get("token") ?? "";
   const { user, workspaces, workspace, isLoading } = useAuth();
@@ -153,3 +153,11 @@ export default function LocalDaemonPairPage() {
     </div>
   );
 }
+
+export default function LocalDaemonPairPage() {
+  return (
+    <Suspense fallback={null}>
+      <LocalDaemonPairPageContent />
+    </Suspense>
+  );
+}