diff --git a/app/auth/callback/page.tsx b/app/auth/callback/page.tsx
index 0d452b7..363666a 100644
--- a/app/auth/callback/page.tsx
+++ b/app/auth/callback/page.tsx
@@ -5,6 +5,7 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { useAuth } from '@/lib/auth/context'
 import { AUTH_URL } from '@/lib/api/client'
 import { exchangeAuthCode, setSessionAction } from '@/app/actions/auth'
+import LoadingOverlay from '@/components/LoadingOverlay'
 
 function AuthCallbackContent() {
   const router = useRouter()
@@ -108,26 +109,12 @@ function AuthCallbackContent() {
     )
   }
 
-  return (
-    <div className="flex min-h-screen items-center justify-center p-4">
-      <div className="text-center">
-        <div className="h-8 w-8 animate-spin rounded-full border-4 border-neutral-200 border-t-neutral-800 mx-auto mb-4"></div>
-        <p className="text-neutral-600 dark:text-neutral-400">Completing sign in...</p>
-      </div>
-    </div>
-  )
+  return <LoadingOverlay title="Completing sign in..." portal={false} />
 }
 
 export default function AuthCallback() {
   return (
-    <Suspense fallback={
-      <div className="flex min-h-screen items-center justify-center p-4">
-        <div className="text-center">
-          <div className="h-8 w-8 animate-spin rounded-full border-4 border-neutral-200 border-t-neutral-800 mx-auto mb-4"></div>
-          <p className="text-neutral-600 dark:text-neutral-400">Loading...</p>
-        </div>
-      </div>
-    }>
+    <Suspense fallback={<LoadingOverlay title="Loading..." portal={false} />}>
       <AuthCallbackContent />
     </Suspense>
   )
diff --git a/app/page.tsx b/app/page.tsx
index f018fa8..3d58d0a 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -12,7 +12,7 @@ export default function HomePage() {
   const { user, loading } = useAuth()
 
   if (loading) {
-    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" />
+    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" portal={false} />
   }
 
   if (!user) {
@@ -91,7 +91,7 @@ export default function HomePage() {
 
   // * Wait for organization context before rendering SiteList to avoid "Organization Required" flash
   if (user && !user.org_id) {
-    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Switching Context..." />
+    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" portal={false} />
   }
 
   return (
diff --git a/components/LoadingOverlay.tsx b/components/LoadingOverlay.tsx
index 342cc27..9f6c9d6 100644
--- a/components/LoadingOverlay.tsx
+++ b/components/LoadingOverlay.tsx
@@ -6,11 +6,13 @@ import { createPortal } from 'react-dom'
 interface LoadingOverlayProps {
   logoSrc?: string
   title?: string
+  portal?: boolean
 }
 
 export default function LoadingOverlay({ 
   logoSrc = "/ciphera_icon_no_margins.png", 
-  title = "Pulse" 
+  title = "Pulse",
+  portal = true
 }: LoadingOverlayProps) {
   const [mounted, setMounted] = useState(false)
 
@@ -19,9 +21,7 @@ export default function LoadingOverlay({
     return () => setMounted(false)
   }, [])
 
-  if (!mounted) return null
-
-  return createPortal(
+  const content = (
     <div className="fixed inset-0 z-[100] flex items-center justify-center bg-white dark:bg-neutral-950 animate-in fade-in duration-200">
       <div className="flex flex-col items-center gap-6">
         <div className="flex items-center gap-3">
@@ -36,7 +36,13 @@ export default function LoadingOverlay({
         </div>
         <div className="h-8 w-8 animate-spin rounded-full border-4 border-neutral-200 border-t-brand-orange dark:border-neutral-800 dark:border-t-brand-orange" />
       </div>
-    </div>,
-    document.body
+    </div>
   )
+
+  if (portal) {
+    if (!mounted) return null
+    return createPortal(content, document.body)
+  }
+
+  return content
 }