diff --git a/app/org-settings/page.tsx b/app/org-settings/page.tsx
index 75633ae..f89e2da 100644
--- a/app/org-settings/page.tsx
+++ b/app/org-settings/page.tsx
@@ -1,15 +1,11 @@
 'use client'
 
-import { useEffect } from 'react'
+import { Suspense, useEffect } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { useUnifiedSettings } from '@/lib/unified-settings-context'
 import { Spinner } from '@ciphera-net/ui'
 
-/**
- * Legacy org settings page — now a redirect handler.
- * Redirects to home and opens unified settings modal at the correct workspace tab.
- */
-export default function OrgSettingsRedirect() {
+function OrgSettingsInner() {
   const router = useRouter()
   const searchParams = useSearchParams()
   const { openUnifiedSettings } = useUnifiedSettings()
@@ -36,3 +32,11 @@ export default function OrgSettingsRedirect() {
     </div>
   )
 }
+
+export default function OrgSettingsRedirect() {
+  return (
+    <Suspense fallback={<div className="flex items-center justify-center py-24"><Spinner className="w-6 h-6 text-neutral-500" /></div>}>
+      <OrgSettingsInner />
+    </Suspense>
+  )
+}