diff --git a/libs/ui/app/container.tsx b/libs/ui/app/container.tsx
index e75704c07..f450a1502 100644
--- a/libs/ui/app/container.tsx
+++ b/libs/ui/app/container.tsx
@@ -10,11 +10,9 @@ interface RootLayoutProps {
 export default function RootLayout({ children, profile }: RootLayoutProps) {
   return (
     <section className="flex h-screen">
-      {/*
-      {process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY && (
+      {profile && process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY && (
         <BillingModal profile={profile} />
       )}
-      */}
       <Sidebar />
       <div className="flex-1 overflow-auto">{children}</div>
     </section>
diff --git a/libs/ui/app/layout.tsx b/libs/ui/app/layout.tsx
index 33be4d4d1..5c6ef92c6 100644
--- a/libs/ui/app/layout.tsx
+++ b/libs/ui/app/layout.tsx
@@ -2,7 +2,7 @@ import "@/styles/globals.css"
 
 import { Metadata } from "next"
 import { cookies } from "next/headers"
-import { createRouteHandlerClient } from "@supabase/auth-helpers-nextjs"
+import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
 
 import { siteConfig } from "@/config/site"
 import { fontSans } from "@/lib/fonts"
@@ -37,7 +37,7 @@ interface RootLayoutProps {
 export const dynamic = "force-dynamic"
 
 export default async function RootLayout({ children }: RootLayoutProps) {
-  const supabase = createRouteHandlerClient({ cookies })
+  const supabase = createServerComponentClient({ cookies })
 
   if (process.env.NEXT_PUBLIC_POSTHOG_KEY) {
     PostHogClient()