diff --git a/package.json b/package.json
index ba9906e..2764890 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,11 @@
   ],
   "scripts": {
     "dev": "concurrently \"npm run dev:backend\" \"npm run dev:web\"",
-    "sdev": "concurrently \"npm run start:backend\" \"npm run dev:web\"","ndev": "dotenv -e .env -- concurrently \"npm run start:backend\" \"npm run dev:web\"",
+    "sdev": "concurrently \"npm run start:backend\" \"npm run dev:web\"",
+    "ndev": "dotenv -e .env -- concurrently \"npm run start:backend\" \"npm run dev:web\"",
     "dev:backend": "npm run dev --workspace=packages/backend",
     "start:backend": "npm start --workspace=packages/backend",
-    "dev:web": "PORT=3032 npm run dev --workspace=packages/web",
+    "dev:web": "PORT=3032 npm start --workspace=packages/web",
     "build_old": "npm run build --workspaces",
     "build": "npm run build --workspace=@vibe/backend && npm run build --workspace=@vibe/web",
     "db:migrate": "npm run migrate --workspace=packages/backend",
diff --git a/packages/web/src/app/home/page.tsx b/packages/web/src/app/home/page.tsx
index a013bb0..ad80cd7 100644
--- a/packages/web/src/app/home/page.tsx
+++ b/packages/web/src/app/home/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState, useEffect, useRef } from 'react'
+import { useState, useEffect, useRef, Suspense } from 'react'
 import { useSearchParams, useRouter } from 'next/navigation'
 import Link from 'next/link'
 import { api } from '@/lib/api'
@@ -100,7 +100,7 @@ function SkeletonCard() {
   )
 }
 
-export default function HomePage() {
+function HomePageContent() {
   const searchParams = useSearchParams()
   const router = useRouter()
 
@@ -299,3 +299,15 @@ export default function HomePage() {
     </div>
   )
 }
+
+export default function HomePage() {
+  return (
+    <Suspense fallback={
+      <div className="min-h-screen bg-[#f6f6f6] flex items-center justify-center">
+        <div className="text-slate-400 text-sm">Loading...</div>
+      </div>
+    }>
+      <HomePageContent />
+    </Suspense>
+  )
+}
diff --git a/packages/web/src/app/register/page.tsx b/packages/web/src/app/register/page.tsx
index 10b1409..5befeb9 100644
--- a/packages/web/src/app/register/page.tsx
+++ b/packages/web/src/app/register/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { useState, Suspense } from 'react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { api } from '@/lib/api'
@@ -17,7 +17,7 @@ const ROLE_REDIRECTS: Record<string, string> = {
   restaurant_owner: '/restaurant/dashboard',
 }
 
-export default function RegisterPage() {
+function RegisterPageContent() {
   const router = useRouter()
   const searchParams = useSearchParams()
   const defaultRole = searchParams.get('role') || 'customer'
@@ -202,3 +202,11 @@ export default function RegisterPage() {
     </div>
   )
 }
+
+export default function RegisterPage() {
+  return (
+    <Suspense fallback={<div className="min-h-screen flex items-center justify-center text-slate-400 text-sm">Loading...</div>}>
+      <RegisterPageContent />
+    </Suspense>
+  )
+}