diff --git a/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx b/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
index 5cad755ec61..aa0e99f7d7d 100644
--- a/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
+++ b/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
@@ -138,10 +138,11 @@ import { useRouter } from 'next/navigation'
 
 const Context = createContext(undefined)
 
-export default function SupabaseProvider({ children }) {
+export default function SupabaseProvider({ children, session }) {
   const [supabase] = useState(() => createBrowserSupabaseClient())
   const router = useRouter()
 
+
   useEffect(() => {
     const {
       data: { subscription },
@@ -155,7 +156,7 @@ export default function SupabaseProvider({ children }) {
   }, [router, supabase])
 
   return (
-    <Context.Provider value={{ supabase }}>
+    <Context.Provider value={{ supabase, session }}>
       <>{children}</>
     </Context.Provider>
   )
@@ -188,13 +189,17 @@ import { useRouter } from 'next/navigation'
 import type { SupabaseClient } from '@supabase/auth-helpers-nextjs'
 import type { Database } from '@/lib/database.types'
 
+type MaybeSession = Session | null
+ 
 type SupabaseContext = {
   supabase: SupabaseClient<Database>
+  session: MaybeSession
 }
 
 const Context = createContext<SupabaseContext | undefined>(undefined)
 
-export default function SupabaseProvider({ children }: { children: React.ReactNode }) {
+
+export default function SupabaseProvider({ children, session }: { children: React.ReactNode, session: MaybeSession }) {
   const [supabase] = useState(() => createBrowserSupabaseClient())
   const router = useRouter()
 
@@ -211,7 +216,7 @@ export default function SupabaseProvider({ children }: { children: React.ReactNo
   }, [router, supabase])
 
   return (
-    <Context.Provider value={{ supabase }}>
+    <Context.Provider value={{ supabase, session }}>
       <>{children}</>
     </Context.Provider>
   )
@@ -256,7 +261,10 @@ export default function RootLayout({ children }) {
   return (
     <html lang="en">
       <body>
-        <SupabaseProvider>{children}</SupabaseProvider>
+        <SupabaseProvider session={session}>
+          <SupabaseListener serverAccessToken={session?.access_token} />
+          {children}
+        </SupabaseProvider>
       </body>
     </html>
   )
@@ -282,7 +290,11 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <html lang="en">
       <body>
-        <SupabaseProvider>{children}</SupabaseProvider>
+        <SupabaseProvider session={session}>
+          <SupabaseListener serverAccessToken={session?.access_token} />
+          {children}
+        </SupabaseProvider>
+
       </body>
     </html>
   )