diff --git a/apps/client/pages/settings.tsx b/apps/client/pages/settings.tsx
index 581a937b..b0380f6b 100644
--- a/apps/client/pages/settings.tsx
+++ b/apps/client/pages/settings.tsx
@@ -35,7 +35,7 @@ export default function SettingsPage() {
                     <Tab.List>
                         <Tab>Details</Tab>
                         <Tab>Security</Tab>
-                        <Tab>Billing</Tab>
+                        {process.env.STRIPE_API_KEY && <Tab>Billing</Tab>}
                     </Tab.List>
                     <Tab.Panels>
                         <Tab.Panel>
@@ -46,9 +46,11 @@ export default function SettingsPage() {
                                 <SecurityPreferences />
                             </div>
                         </Tab.Panel>
-                        <Tab.Panel>
-                            <BillingPreferences />
-                        </Tab.Panel>
+                        {process.env.STRIPE_API_KEY && (
+                            <Tab.Panel>
+                                <BillingPreferences />
+                            </Tab.Panel>
+                        )}
                     </Tab.Panels>
                 </Tab.Group>
             </section>
diff --git a/libs/client/features/src/layout/DesktopLayout.tsx b/libs/client/features/src/layout/DesktopLayout.tsx
index 21023d6b..55eaf49a 100644
--- a/libs/client/features/src/layout/DesktopLayout.tsx
+++ b/libs/client/features/src/layout/DesktopLayout.tsx
@@ -313,7 +313,6 @@ function DefaultContent({
     email,
 }: PropsWithChildren<{ onboarding?: ReactNode; name?: string; email?: string }>) {
     const { addAccount } = useAccountContext()
-
     return (
         <>
             <div className="flex items-center justify-between mb-4">
@@ -338,7 +337,7 @@ function DefaultContent({
 
             {onboarding && onboarding}
 
-            <UpgradePrompt />
+            {process.env.STRIPE_API_KEY && <UpgradePrompt />}
 
             <div className="flex items-center justify-between">
                 <div className="text-base">
diff --git a/libs/client/features/src/layout/MobileLayout.tsx b/libs/client/features/src/layout/MobileLayout.tsx
index 585af1dd..960b929e 100644
--- a/libs/client/features/src/layout/MobileLayout.tsx
+++ b/libs/client/features/src/layout/MobileLayout.tsx
@@ -174,7 +174,7 @@ export function MobileLayout({ children, sidebar }: MobileLayoutProps) {
                         </section>
 
                         <div className="pt-6 shrink-0">
-                            <UpgradePrompt />
+                            {process.env.STRIPE_API_KEY && <UpgradePrompt />}
                         </div>
                     </div>
                 </div>
diff --git a/libs/client/features/src/user-billing/BillingPreferences.tsx b/libs/client/features/src/user-billing/BillingPreferences.tsx
index 022a03d8..66064d1f 100644
--- a/libs/client/features/src/user-billing/BillingPreferences.tsx
+++ b/libs/client/features/src/user-billing/BillingPreferences.tsx
@@ -78,7 +78,9 @@ export function BillingPreferences() {
                     </div>
                 )}
             </div>
-            <UpgradeTakeover open={takeoverOpen} onClose={() => setTakeoverOpen(false)} />
+            {process.env.STRIPE_API_KEY && (
+                <UpgradeTakeover open={takeoverOpen} onClose={() => setTakeoverOpen(false)} />
+            )}
         </>
     )
 }