diff --git a/apps/dashboard/src/actions/billing.ts b/apps/dashboard/src/actions/billing.ts
index 9ac018e..05020fc 100644
--- a/apps/dashboard/src/actions/billing.ts
+++ b/apps/dashboard/src/actions/billing.ts
@@ -4,9 +4,10 @@ import { db } from '@/lib/db'
 import { organization, projects, flags, member, evaluations, eq, and, sql } from '@switchflag/db'
 import { requireSession } from '@/lib/auth-server'
 import { getStripe, getStripePriceIds } from '@/lib/stripe'
-import { parseOrgBilling, type PlanId, type OrganizationBilling } from '@switchflag/shared'
+import { parseOrgBilling, PLANS, type PlanId, type OrganizationBilling } from '@switchflag/shared'
 import { z } from 'zod'
 import { env } from '@/env'
+import { sendWaitlistNotificationEmail } from '@/lib/email'
 import type { ActionResult } from './types'
 
 const checkoutSchema = z.object({
@@ -63,6 +64,44 @@ export async function createCheckoutSession(
   return { success: true, data: { url: checkoutSession.url } }
 }
 
+export async function joinWaitlist(planId: string, billingInterval: string): Promise<ActionResult> {
+  const session = await requireSession()
+  const organizationId = session.session.activeOrganizationId
+
+  if (!organizationId) {
+    return { success: false, error: 'No active organization' }
+  }
+
+  const parsed = checkoutSchema.safeParse({ planId, billingInterval })
+  if (!parsed.success) {
+    return { success: false, error: 'Invalid plan or billing interval' }
+  }
+
+  const org = await db.query.organization.findFirst({
+    where: eq(organization.id, organizationId),
+  })
+
+  if (!org) {
+    return { success: false, error: 'Organization not found' }
+  }
+
+  const plan = PLANS[parsed.data.planId]
+
+  try {
+    await sendWaitlistNotificationEmail({
+      userName: session.user.name,
+      userEmail: session.user.email,
+      organizationName: org.name,
+      planName: plan.name,
+      billingInterval: parsed.data.billingInterval,
+    })
+  } catch {
+    return { success: false, error: 'Failed to submit waitlist request' }
+  }
+
+  return { success: true, data: undefined }
+}
+
 export async function createPortalSession(): Promise<ActionResult<{ url: string }>> {
   const session = await requireSession()
   const organizationId = session.session.activeOrganizationId
diff --git a/apps/dashboard/src/components/billing/billing-page-client.test.tsx b/apps/dashboard/src/components/billing/billing-page-client.test.tsx
new file mode 100644
index 0000000..ed4f20a
--- /dev/null
+++ b/apps/dashboard/src/components/billing/billing-page-client.test.tsx
@@ -0,0 +1,150 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+const mockCreateCheckoutSession = vi.fn()
+const mockCreatePortalSession = vi.fn()
+const mockJoinWaitlist = vi.fn()
+
+vi.mock('@/actions/billing', () => ({
+  createCheckoutSession: (...args: unknown[]) => mockCreateCheckoutSession(...args),
+  createPortalSession: (...args: unknown[]) => mockCreatePortalSession(...args),
+  joinWaitlist: (...args: unknown[]) => mockJoinWaitlist(...args),
+}))
+
+vi.mock('next/navigation', () => ({
+  useSearchParams: () => ({
+    get: vi.fn(() => null),
+  }),
+}))
+
+let mockBillingEnabled: string | undefined
+
+vi.mock('@/env', () => ({
+  env: {
+    get NEXT_PUBLIC_BILLING_ENABLED() {
+      return mockBillingEnabled
+    },
+  },
+}))
+
+import { BillingPageClient } from './billing-page-client'
+import type { SubscriptionInfo } from '@/actions/billing'
+
+const defaultSubscription: SubscriptionInfo = {
+  plan: 'developer',
+  billing: { plan: 'developer' },
+  usage: { flags: 5, requests: 1000, members: 2 },
+}
+
+describe('BillingPageClient', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockBillingEnabled = undefined
+  })
+
+  describe('when billing is disabled (waitlist mode)', () => {
+    beforeEach(() => {
+      mockBillingEnabled = undefined
+    })
+
+    it('renders Join Waitlist buttons for paid plans', () => {
+      render(<BillingPageClient subscription={defaultSubscription} />)
+      const buttons = screen.getAllByRole('button', { name: 'Join Waitlist' })
+      expect(buttons).toHaveLength(2)
+    })
+
+    it('calls joinWaitlist server action when Join Waitlist is clicked', async () => {
+      mockJoinWaitlist.mockResolvedValue({ success: true, data: undefined })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Join Waitlist' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(mockJoinWaitlist).toHaveBeenCalledWith('startup', 'monthly')
+      })
+    })
+
+    it('shows success banner after joining waitlist', async () => {
+      mockJoinWaitlist.mockResolvedValue({ success: true, data: undefined })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Join Waitlist' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(
+          screen.getByText("Thanks! We'll notify you when paid plans are available.")
+        ).toBeInTheDocument()
+      })
+    })
+
+    it('shows "You\'re on the list!" for submitted plan', async () => {
+      mockJoinWaitlist.mockResolvedValue({ success: true, data: undefined })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Join Waitlist' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(screen.getByRole('button', { name: "You're on the list!" })).toBeDisabled()
+      })
+    })
+
+    it('does not call createCheckoutSession', async () => {
+      mockJoinWaitlist.mockResolvedValue({ success: true, data: undefined })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Join Waitlist' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(mockJoinWaitlist).toHaveBeenCalled()
+      })
+      expect(mockCreateCheckoutSession).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('when billing is enabled (Stripe mode)', () => {
+    beforeEach(() => {
+      mockBillingEnabled = 'true'
+    })
+
+    it('renders Upgrade buttons for paid plans', () => {
+      render(<BillingPageClient subscription={defaultSubscription} />)
+      const buttons = screen.getAllByRole('button', { name: 'Upgrade' })
+      expect(buttons).toHaveLength(2)
+    })
+
+    it('calls createCheckoutSession when Upgrade is clicked', async () => {
+      mockCreateCheckoutSession.mockResolvedValue({
+        success: true,
+        data: { url: 'https://checkout.stripe.com/test' },
+      })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Upgrade' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(mockCreateCheckoutSession).toHaveBeenCalledWith('startup', 'monthly')
+      })
+    })
+
+    it('does not call joinWaitlist', async () => {
+      mockCreateCheckoutSession.mockResolvedValue({
+        success: true,
+        data: { url: 'https://checkout.stripe.com/test' },
+      })
+      render(<BillingPageClient subscription={defaultSubscription} />)
+
+      const buttons = screen.getAllByRole('button', { name: 'Upgrade' })
+      fireEvent.click(buttons[0]!)
+
+      await waitFor(() => {
+        expect(mockCreateCheckoutSession).toHaveBeenCalled()
+      })
+      expect(mockJoinWaitlist).not.toHaveBeenCalled()
+    })
+  })
+})
diff --git a/apps/dashboard/src/components/billing/billing-page-client.tsx b/apps/dashboard/src/components/billing/billing-page-client.tsx
index c5ba29c..cb3e815 100644
--- a/apps/dashboard/src/components/billing/billing-page-client.tsx
+++ b/apps/dashboard/src/components/billing/billing-page-client.tsx
@@ -3,8 +3,9 @@
 import { useState } from 'react'
 import { useSearchParams } from 'next/navigation'
 import { PLANS, getPlanLimits, type PlanId } from '@switchflag/shared'
-import { createCheckoutSession, createPortalSession } from '@/actions/billing'
+import { createCheckoutSession, createPortalSession, joinWaitlist } from '@/actions/billing'
 import type { SubscriptionInfo } from '@/actions/billing'
+import { env } from '@/env'
 import { UsageCard } from './usage-card'
 import { PlanCard } from './plan-card'
 
@@ -38,7 +39,10 @@ export function BillingPageClient({ subscription }: BillingPageClientProps) {
   const searchParams = useSearchParams()
   const [billingInterval, setBillingInterval] = useState<'monthly' | 'yearly'>('monthly')
   const [isLoading, setIsLoading] = useState(false)
+  const [waitlistedPlans, setWaitlistedPlans] = useState<Set<PlanId>>(new Set())
+  const [showWaitlistSuccess, setShowWaitlistSuccess] = useState(false)
 
+  const billingEnabled = env.NEXT_PUBLIC_BILLING_ENABLED === 'true'
   const showSuccess = searchParams.get('success') === 'true'
   const showCanceled = searchParams.get('canceled') === 'true'
 
@@ -48,15 +52,29 @@ export function BillingPageClient({ subscription }: BillingPageClientProps) {
   async function handleSelectPlan(planId: PlanId) {
     setIsLoading(true)
     try {
-      const result = await createCheckoutSession(planId, billingInterval)
-      if (result.success) {
-        window.location.href = result.data.url
+      if (billingEnabled) {
+        await handleCheckout(planId)
+      } else {
+        await handleWaitlist(planId)
       }
     } finally {
       setIsLoading(false)
     }
   }
 
+  async function handleCheckout(planId: PlanId) {
+    const result = await createCheckoutSession(planId, billingInterval)
+    if (!result.success) return
+    window.location.href = result.data.url
+  }
+
+  async function handleWaitlist(planId: PlanId) {
+    const result = await joinWaitlist(planId, billingInterval)
+    if (!result.success) return
+    setWaitlistedPlans((prev) => new Set(prev).add(planId))
+    setShowWaitlistSuccess(true)
+  }
+
   async function handleManageBilling() {
     setIsLoading(true)
     try {
@@ -84,6 +102,13 @@ export function BillingPageClient({ subscription }: BillingPageClientProps) {
           <p className="text-sm font-medium text-yellow-400">Checkout was canceled.</p>
         </div>
       )}
+      {showWaitlistSuccess && (
+        <div className="rounded-xl border border-green-500/20 bg-green-500/10 px-6 py-4">
+          <p className="text-sm font-medium text-green-400">
+            Thanks! We'll notify you when paid plans are available.
+          </p>
+        </div>
+      )}
 
       {/* Page Header */}
       <div>
@@ -175,6 +200,8 @@ export function BillingPageClient({ subscription }: BillingPageClientProps) {
               billingInterval={billingInterval}
               onSelect={handleSelectPlan}
               isLoading={isLoading}
+              waitlistMode={!billingEnabled}
+              onWaitlist={waitlistedPlans.has(plan.id)}
             />
           ))}
         </div>
diff --git a/apps/dashboard/src/components/billing/plan-card.test.tsx b/apps/dashboard/src/components/billing/plan-card.test.tsx
new file mode 100644
index 0000000..ae8eb56
--- /dev/null
+++ b/apps/dashboard/src/components/billing/plan-card.test.tsx
@@ -0,0 +1,70 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import { describe, it, expect, vi } from 'vitest'
+import { PlanCard } from './plan-card'
+import { PLANS } from '@switchflag/shared'
+
+const startupPlan = PLANS.startup
+const defaultProps = {
+  plan: startupPlan,
+  currentPlan: 'developer' as const,
+  billingInterval: 'monthly' as const,
+  onSelect: vi.fn(),
+  isLoading: false,
+}
+
+describe('PlanCard', () => {
+  describe('default mode (no waitlist)', () => {
+    it('renders Upgrade button for upgradable plan', () => {
+      render(<PlanCard {...defaultProps} />)
+      expect(screen.getByRole('button', { name: 'Upgrade' })).toBeInTheDocument()
+    })
+
+    it('calls onSelect when Upgrade is clicked', () => {
+      const onSelect = vi.fn()
+      render(<PlanCard {...defaultProps} onSelect={onSelect} />)
+      fireEvent.click(screen.getByRole('button', { name: 'Upgrade' }))
+      expect(onSelect).toHaveBeenCalledWith('startup')
+    })
+  })
+
+  describe('waitlist mode', () => {
+    it('renders Join Waitlist button when waitlistMode is true', () => {
+      render(<PlanCard {...defaultProps} waitlistMode onWaitlist={false} />)
+      expect(screen.getByRole('button', { name: 'Join Waitlist' })).toBeInTheDocument()
+    })
+
+    it('calls onSelect when Join Waitlist is clicked', () => {
+      const onSelect = vi.fn()
+      render(<PlanCard {...defaultProps} onSelect={onSelect} waitlistMode onWaitlist={false} />)
+      fireEvent.click(screen.getByRole('button', { name: 'Join Waitlist' }))
+      expect(onSelect).toHaveBeenCalledWith('startup')
+    })
+
+    it('renders disabled "You\'re on the list!" button when onWaitlist is true', () => {
+      render(<PlanCard {...defaultProps} waitlistMode onWaitlist />)
+      const button = screen.getByRole('button', { name: "You're on the list!" })
+      expect(button).toBeInTheDocument()
+      expect(button).toBeDisabled()
+    })
+
+    it('does not render Join Waitlist when plan is current', () => {
+      render(<PlanCard {...defaultProps} currentPlan="startup" waitlistMode onWaitlist={false} />)
+      expect(screen.getByRole('button', { name: 'Current Plan' })).toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Join Waitlist' })).not.toBeInTheDocument()
+    })
+
+    it('does not render Join Waitlist for developer (free) plan', () => {
+      render(
+        <PlanCard
+          {...defaultProps}
+          plan={PLANS.developer}
+          currentPlan="startup"
+          waitlistMode
+          onWaitlist={false}
+        />
+      )
+      expect(screen.getByRole('button', { name: 'Free Plan' })).toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Join Waitlist' })).not.toBeInTheDocument()
+    })
+  })
+})
diff --git a/apps/dashboard/src/components/billing/plan-card.tsx b/apps/dashboard/src/components/billing/plan-card.tsx
index a9a574d..dcd15b8 100644
--- a/apps/dashboard/src/components/billing/plan-card.tsx
+++ b/apps/dashboard/src/components/billing/plan-card.tsx
@@ -9,6 +9,8 @@ interface PlanCardProps {
   readonly billingInterval: 'monthly' | 'yearly'
   readonly onSelect: (planId: PlanId) => void
   readonly isLoading: boolean
+  readonly waitlistMode?: boolean
+  readonly onWaitlist?: boolean
 }
 
 function CheckIcon() {
@@ -30,6 +32,8 @@ export function PlanCard({
   billingInterval,
   onSelect,
   isLoading,
+  waitlistMode,
+  onWaitlist,
 }: PlanCardProps) {
   const isCurrent = plan.id === currentPlan
   const price = billingInterval === 'yearly' ? plan.yearlyPrice : plan.monthlyPrice
@@ -83,6 +87,13 @@ export function PlanCard({
         >
           Free Plan
         </button>
+      ) : waitlistMode && onWaitlist ? (
+        <button
+          disabled
+          className="block w-full cursor-default rounded-xl bg-green-600/20 px-4 py-2.5 text-center text-sm font-bold text-green-400"
+        >
+          You're on the list!
+        </button>
       ) : (
         <button
           onClick={() => onSelect(plan.id)}
@@ -97,6 +108,8 @@ export function PlanCard({
             <span className="flex items-center justify-center gap-2">
               <Spinner size="sm" /> Processing...
             </span>
+          ) : waitlistMode ? (
+            'Join Waitlist'
           ) : isUpgrade ? (
             'Upgrade'
           ) : (
diff --git a/apps/dashboard/src/emails/templates/waitlist-notification.tsx b/apps/dashboard/src/emails/templates/waitlist-notification.tsx
new file mode 100644
index 0000000..26e5782
--- /dev/null
+++ b/apps/dashboard/src/emails/templates/waitlist-notification.tsx
@@ -0,0 +1,72 @@
+import { Heading, Text } from '@react-email/components'
+import { EmailLayout } from '../components/email-layout'
+import { EMAIL_CONSTANTS } from '../constants'
+
+interface WaitlistNotificationProps {
+  userName: string
+  userEmail: string
+  organizationName: string
+  planName: string
+  billingInterval: string
+  timestamp: string
+}
+
+const { colors } = EMAIL_CONSTANTS
+
+export function WaitlistNotification({
+  userName,
+  userEmail,
+  organizationName,
+  planName,
+  billingInterval,
+  timestamp,
+}: WaitlistNotificationProps) {
+  return (
+    <EmailLayout preview={`Waitlist: ${userName || userEmail} interested in ${planName}`}>
+      <Heading style={heading}>Waitlist request</Heading>
+      <Text style={text}>
+        <strong>Name:</strong> {userName || 'Not provided'}
+      </Text>
+      <Text style={text}>
+        <strong>Email:</strong> {userEmail}
+      </Text>
+      <Text style={text}>
+        <strong>Organization:</strong> {organizationName}
+      </Text>
+      <Text style={text}>
+        <strong>Plan:</strong> {planName}
+      </Text>
+      <Text style={text}>
+        <strong>Billing interval:</strong> {billingInterval}
+      </Text>
+      <Text style={text}>
+        <strong>Time:</strong> {timestamp}
+      </Text>
+    </EmailLayout>
+  )
+}
+
+const heading: React.CSSProperties = {
+  color: colors.heading,
+  fontSize: '22px',
+  fontWeight: 700,
+  margin: '0 0 16px',
+}
+
+const text: React.CSSProperties = {
+  color: colors.text,
+  fontSize: '14px',
+  lineHeight: '24px',
+  margin: '0 0 12px',
+}
+
+WaitlistNotification.PreviewProps = {
+  userName: 'Jane Doe',
+  userEmail: 'jane@example.com',
+  organizationName: 'Acme Corp',
+  planName: 'Startup',
+  billingInterval: 'monthly',
+  timestamp: '2025-01-15T10:30:00Z',
+} satisfies WaitlistNotificationProps
+
+export default WaitlistNotification
diff --git a/apps/dashboard/src/env.ts b/apps/dashboard/src/env.ts
index ce16bc4..c9f2c9c 100644
--- a/apps/dashboard/src/env.ts
+++ b/apps/dashboard/src/env.ts
@@ -43,6 +43,7 @@ export const env = createEnv({
     NEXT_PUBLIC_GRAFANA_FARO_URL: z.string().url().optional(),
     NEXT_PUBLIC_APP_VERSION: z.string().optional(),
     NEXT_PUBLIC_TURNSTILE_SITE_KEY: z.string().optional(),
+    NEXT_PUBLIC_BILLING_ENABLED: z.string().optional(),
   },
   runtimeEnv: {
     BETTER_AUTH_SECRET: process.env['BETTER_AUTH_SECRET'],
@@ -68,6 +69,7 @@ export const env = createEnv({
     NEXT_PUBLIC_GRAFANA_FARO_URL: process.env['NEXT_PUBLIC_GRAFANA_FARO_URL'],
     NEXT_PUBLIC_APP_VERSION: process.env['NEXT_PUBLIC_APP_VERSION'],
     NEXT_PUBLIC_TURNSTILE_SITE_KEY: process.env['NEXT_PUBLIC_TURNSTILE_SITE_KEY'],
+    NEXT_PUBLIC_BILLING_ENABLED: process.env['NEXT_PUBLIC_BILLING_ENABLED'],
   },
   skipValidation: !!process.env['SKIP_ENV_VALIDATION'],
 })
diff --git a/apps/dashboard/src/lib/email.ts b/apps/dashboard/src/lib/email.ts
index e2482b3..6e60186 100644
--- a/apps/dashboard/src/lib/email.ts
+++ b/apps/dashboard/src/lib/email.ts
@@ -8,6 +8,7 @@ import { EmailVerification } from '@/emails/templates/email-verification'
 import { PasswordReset } from '@/emails/templates/password-reset'
 import { SignupNotification } from '@/emails/templates/signup-notification'
 import { TeamInvitation } from '@/emails/templates/team-invitation'
+import { WaitlistNotification } from '@/emails/templates/waitlist-notification'
 
 export const getResend = () => {
   return new Resend(env.RESEND_API_KEY)
@@ -97,6 +98,44 @@ export async function sendNewSignupNotificationEmail({
   })
 }
 
+export async function sendWaitlistNotificationEmail({
+  userName,
+  userEmail,
+  organizationName,
+  planName,
+  billingInterval,
+}: {
+  userName: string
+  userEmail: string
+  organizationName: string
+  planName: string
+  billingInterval: string
+}) {
+  const adminEmail = env.ADMIN_NOTIFICATION_EMAIL
+  if (!adminEmail) return
+
+  const timestamp = new Date().toISOString()
+  const { html, text } = await renderEmail(
+    createElement(WaitlistNotification, {
+      userName,
+      userEmail,
+      organizationName,
+      planName,
+      billingInterval,
+      timestamp,
+    })
+  )
+
+  await getResend().emails.send({
+    from: EMAIL_CONSTANTS.fromAddress,
+    to: adminEmail,
+    subject: `Waitlist: ${userName || userEmail} interested in ${planName}`,
+    html,
+    text,
+    headers: unsubscribeHeaders,
+  })
+}
+
 export async function sendInvitationEmail({
   to,
   inviterName,