diff --git a/browser_tests/tests/dialogs/endedSubscription.spec.ts b/browser_tests/tests/dialogs/endedSubscription.spec.ts
index 11413a26c7e..7234b3af7ea 100644
--- a/browser_tests/tests/dialogs/endedSubscription.spec.ts
+++ b/browser_tests/tests/dialogs/endedSubscription.spec.ts
@@ -81,6 +81,9 @@ test.describe('Inactive Team subscription billing', { tag: '@cloud' }, () => {
     await expect(
       content.getByRole('heading', { name: 'Inactive team subscription' })
     ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Reactivate plan' })
+    ).toBeVisible()
     await content.getByRole('button', { name: 'Billing & invoices' }).click()
     await expect
       .poll(() => page.locator('html').getAttribute('data-opened-url'))
diff --git a/browser_tests/tests/dialogs/enterpriseTierCloud.spec.ts b/browser_tests/tests/dialogs/enterpriseTierCloud.spec.ts
new file mode 100644
index 00000000000..2fe2ad08a2d
--- /dev/null
+++ b/browser_tests/tests/dialogs/enterpriseTierCloud.spec.ts
@@ -0,0 +1,247 @@
+import { expect } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
+import type { BillingStatusResponse } from '@comfyorg/ingest-types'
+
+import { cloudAppFixture as test } from '@e2e/fixtures/cloudAppFixture'
+import { TopUpCreditsDialog } from '@e2e/fixtures/components/TopUpCreditsDialog'
+import {
+  DEFAULT_TEAM_MEMBERS,
+  TEAM_BILLING_STATUS,
+  TEAM_WORKSPACE
+} from '@e2e/fixtures/data/cloudWorkspace'
+import { CloudWorkspaceMockHelper } from '@e2e/fixtures/helpers/CloudWorkspaceMockHelper'
+
+const APP_URL = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
+
+const ACTIVE_ENTERPRISE_STATUS = {
+  ...TEAM_BILLING_STATUS,
+  subscription_tier: 'PRO',
+  plan_slug: 'enterprise_monthly',
+  renewal_date: '2027-04-25T00:00:00Z'
+} satisfies BillingStatusResponse
+
+const ENDED_ENTERPRISE_STATUS = {
+  ...ACTIVE_ENTERPRISE_STATUS,
+  billing_status: 'inactive',
+  is_active: false,
+  subscription_status: 'ended'
+} satisfies BillingStatusResponse
+
+const CANCELLED_ACTIVE_ENTERPRISE_STATUS = {
+  ...ACTIVE_ENTERPRISE_STATUS,
+  cancel_at: '2027-04-25T00:00:00Z',
+  subscription_status: 'canceled'
+} satisfies BillingStatusResponse
+
+const ACTIVE_UNRECOGNIZED_TIER_STATUS = {
+  ...TEAM_BILLING_STATUS,
+  subscription_tier: 'FUTURE_TIER',
+  plan_slug: 'future-tier-monthly'
+}
+
+async function setupWorkspace(
+  page: Page,
+  billingStatus: BillingStatusResponse
+) {
+  const workspace = new CloudWorkspaceMockHelper(page)
+  await workspace.setup(DEFAULT_TEAM_MEMBERS, TEAM_WORKSPACE, billingStatus)
+  return workspace
+}
+
+async function captureOpenedUrls(page: Page) {
+  await page.addInitScript(() => {
+    window.open = (url) => {
+      document.documentElement.dataset.openedUrl = String(url)
+      return window
+    }
+  })
+}
+
+async function expectNoSelfServicePlanActions(content: Locator) {
+  await expect(
+    content.getByRole('button', {
+      name: /Change plan|Cancel|Subscribe|Reactivate/i
+    })
+  ).toHaveCount(0)
+  await expect(
+    content.getByText('View more details about plans & pricing')
+  ).toHaveCount(0)
+}
+
+test.describe('Enterprise workspace billing', { tag: '@cloud' }, () => {
+  test.describe.configure({ timeout: 60_000 })
+
+  test('shows sales-managed plan details without catalog or lifecycle controls', async ({
+    page
+  }) => {
+    const workspace = await setupWorkspace(page, ACTIVE_ENTERPRISE_STATUS)
+    const content = await workspace.openWorkspaceSettings()
+
+    await expect(
+      content.getByRole('heading', { name: 'Enterprise' })
+    ).toBeVisible()
+    await expect(content.getByText('Renews on Apr 25, 2027')).toBeVisible()
+    await expect(content.getByText('Your plan includes:')).toHaveCount(0)
+    await expectNoSelfServicePlanActions(content)
+  })
+
+  test('keeps credit top-up and billing portal access available', async ({
+    page
+  }) => {
+    await captureOpenedUrls(page)
+    const workspace = await setupWorkspace(page, ACTIVE_ENTERPRISE_STATUS)
+    const content = await workspace.openWorkspaceSettings()
+
+    await content.getByRole('button', { name: 'Billing & invoices' }).click()
+    await expect
+      .poll(() => page.locator('html').getAttribute('data-opened-url'))
+      .toBe('https://billing.example/portal')
+
+    await content.getByRole('button', { name: 'Add credits' }).click()
+    await new TopUpCreditsDialog(page).waitForVisible()
+  })
+
+  test('removes pricing entry points from the profile menu and deep links', async ({
+    page
+  }) => {
+    await setupWorkspace(page, ACTIVE_ENTERPRISE_STATUS)
+    await page.goto(`${APP_URL}/?pricing=team`)
+    await page.waitForFunction(() => !!window.app?.extensionManager, null, {
+      timeout: 45_000
+    })
+
+    await expect(page).not.toHaveURL(/[?&]pricing=/)
+    await expect(
+      page.getByRole('heading', { name: 'Choose a Plan' })
+    ).toHaveCount(0)
+
+    await page.getByRole('button', { name: 'Current user' }).click()
+    const popover = page.getByTestId('current-user-popover')
+    await expect(popover.getByTestId('add-credits-button')).toBeVisible()
+    await expect(popover.getByTestId('manage-plan-menu-item')).toBeVisible()
+    await expect(popover.getByTestId('plans-pricing-menu-item')).toHaveCount(0)
+  })
+
+  test('keeps a cancelled active Enterprise workspace sales-managed', async ({
+    page
+  }) => {
+    const workspace = await setupWorkspace(
+      page,
+      CANCELLED_ACTIVE_ENTERPRISE_STATUS
+    )
+    const content = await workspace.openWorkspaceSettings()
+
+    await expect(
+      content.getByRole('heading', { name: 'Enterprise' })
+    ).toBeVisible()
+    await expect(content.getByText('Canceled', { exact: true })).toBeVisible()
+    await expectNoSelfServicePlanActions(content)
+
+    await page
+      .getByTestId('settings-dialog')
+      .getByRole('button', { name: 'Close dialog' })
+      .click()
+    await page.getByRole('button', { name: 'Current user' }).click()
+    const popover = page.getByTestId('current-user-popover')
+    await expect(
+      popover.getByRole('button', { name: 'Resubscribe' })
+    ).toHaveCount(0)
+    await expect(popover.getByTestId('plans-pricing-menu-item')).toHaveCount(0)
+  })
+
+  test('keeps an ended Enterprise workspace out of self-service recovery', async ({
+    page
+  }) => {
+    const workspace = await setupWorkspace(page, ENDED_ENTERPRISE_STATUS)
+    const content = await workspace.openWorkspaceSettings()
+
+    await expect(content.getByText('Your subscription has ended')).toBeVisible()
+    await expect(
+      content.getByRole('heading', { name: 'Enterprise' })
+    ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Add credits' })
+    ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Billing & invoices' })
+    ).toBeVisible()
+    await expectNoSelfServicePlanActions(content)
+
+    await expect(page.getByTestId('queue-button')).toBeVisible()
+    await expect(page.getByTestId('subscribe-to-run-button')).toHaveCount(0)
+
+    await page
+      .getByTestId('settings-dialog')
+      .getByRole('button', { name: 'Close dialog' })
+      .click()
+    await page.getByTestId('queue-button').click()
+    await expect(
+      page.getByRole('heading', { name: 'Choose a Plan' })
+    ).toHaveCount(0)
+  })
+})
+
+test.describe('Non-Enterprise billing regression', { tag: '@cloud' }, () => {
+  test('keeps self-service controls and catalog details for a Pro team', async ({
+    page
+  }) => {
+    const workspace = await setupWorkspace(page, TEAM_BILLING_STATUS)
+    const content = await workspace.openWorkspaceSettings()
+
+    await expect(
+      content.getByRole('heading', { name: 'Team', exact: true })
+    ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Change plan' })
+    ).toBeVisible()
+    await expect(
+      content.getByText('Your plan includes everything in Pro, plus:', {
+        exact: false
+      })
+    ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Add credits' })
+    ).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Billing & invoices' })
+    ).toBeVisible()
+
+    await page
+      .getByTestId('settings-dialog')
+      .getByRole('button', { name: 'Close dialog' })
+      .click()
+    await page.getByRole('button', { name: 'Current user' }).click()
+    await expect(
+      page
+        .getByTestId('current-user-popover')
+        .getByTestId('plans-pricing-menu-item')
+    ).toBeVisible()
+  })
+})
+
+test.describe('Unrecognized billing tier regression', { tag: '@cloud' }, () => {
+  test.describe.configure({ timeout: 60_000 })
+
+  test('keeps an active subscription usable when its tier is unrecognized', async ({
+    page
+  }) => {
+    const pageErrors: string[] = []
+    page.on('pageerror', (error) => pageErrors.push(error.message))
+
+    const workspace = await setupWorkspace(page, TEAM_BILLING_STATUS)
+    await page.route('**/api/billing/status', (route) =>
+      route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(ACTIVE_UNRECOGNIZED_TIER_STATUS)
+      })
+    )
+    const content = await workspace.openWorkspaceSettings()
+
+    await expect(content.getByText('Total credits')).toBeVisible()
+    await expect(
+      content.getByRole('button', { name: 'Add credits' })
+    ).toBeVisible()
+    expect(pageErrors).toEqual([])
+  })
+})
diff --git a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts
index 9ae38729181..b46f6d21bb7 100644
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts
@@ -1,13 +1,14 @@
 import userEvent from '@testing-library/user-event'
 import { render, screen, waitFor } from '@testing-library/vue'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref } from 'vue'
+import { computed, nextTick, ref } from 'vue'
 
 import CloudRunButtonWrapper from './CloudRunButtonWrapper.vue'
 
 const mockCanRunWorkflows = ref(true)
 const mockIsInitialized = ref(true)
 const mockBillingStatus = ref<string | null>('paid')
+const mockShowsSubscribeUpsellUI = ref(true)
 const state = vi.hoisted(() => ({
   v1PaymentRecovery: true,
   canManageSubscription: true,
@@ -46,6 +47,18 @@ vi.mock('@/composables/useFeatureFlags', () => ({
   })
 }))
 
+vi.mock(
+  '@/platform/cloud/subscription/composables/useBillingPolicyCapabilities',
+  () => ({
+    useBillingPolicyCapabilities: () => ({
+      billingPolicyCapabilities: computed(() => ({
+        topUpAccess: 'allowed',
+        showsSubscribeUpsellUI: mockShowsSubscribeUpsellUI.value
+      }))
+    })
+  })
+)
+
 vi.mock('@/composables/useErrorHandling', () => ({
   useErrorHandling: () => ({ toastErrorHandler: state.toastErrorHandler })
 }))
@@ -98,6 +111,7 @@ describe('CloudRunButtonWrapper', () => {
     mockCanRunWorkflows.value = true
     mockIsInitialized.value = true
     mockBillingStatus.value = 'paid'
+    mockShowsSubscribeUpsellUI.value = true
     state.v1PaymentRecovery = true
     state.canManageSubscription = true
   })
@@ -131,6 +145,17 @@ describe('CloudRunButtonWrapper', () => {
     expect(screen.queryByTestId('queue-button')).not.toBeInTheDocument()
   })
 
+  it('keeps the run button without a subscribe upsell when policy disables it', () => {
+    mockCanRunWorkflows.value = false
+    mockShowsSubscribeUpsellUI.value = false
+    renderWrapper()
+
+    expect(screen.getByTestId('queue-button')).toBeInTheDocument()
+    expect(
+      screen.queryByTestId('subscribe-to-run-button')
+    ).not.toBeInTheDocument()
+  })
+
   it('refreshes stale billing state on focus and restores Run', async () => {
     mockCanRunWorkflows.value = false
     mockBillingStatus.value = 'inactive'
diff --git a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
index 3d3bdac32f4..8f9c2d61deb 100644
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
@@ -1,6 +1,10 @@
 <template>
   <ComfyQueueButton
-    v-if="!showsSubscribeToRunPrompt || paymentRecoveryLock"
+    v-if="
+      !showsSubscribeToRunPrompt ||
+      paymentRecoveryLock ||
+      !billingPolicyCapabilities.showsSubscribeUpsellUI
+    "
     :payment-recovery-lock="paymentRecoveryLock"
     @payment-recovery-click="showPaymentRecoveryDialog"
   />
@@ -15,6 +19,7 @@ import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'
+import { useBillingPolicyCapabilities } from '@/platform/cloud/subscription/composables/useBillingPolicyCapabilities'
 import SubscriptionPausedDialog from '@/platform/workspace/components/SubscriptionPausedDialog.vue'
 import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
 import { useDialogService } from '@/services/dialogService'
@@ -29,6 +34,7 @@ const {
   fetchBalance
 } = useBillingContext()
 const { flags } = useFeatureFlags()
+const { billingPolicyCapabilities } = useBillingPolicyCapabilities()
 const { permissions } = useWorkspaceUI()
 const dialogService = useDialogService()
 const dialogStore = useDialogStore()
diff --git a/src/composables/useCoreCommands.test.ts b/src/composables/useCoreCommands.test.ts
index a98f4593e1b..27fae0e59d5 100644
--- a/src/composables/useCoreCommands.test.ts
+++ b/src/composables/useCoreCommands.test.ts
@@ -15,6 +15,11 @@ import { fromPartial } from '@total-typescript/shoehorn'
 
 // Mock vue-i18n for useExternalLink
 const mockLocale = ref('en')
+const mockBillingState = vi.hoisted(() => ({
+  canAccessSubscriptionFeatures: true,
+  showsSubscribeUpsellUI: true,
+  showSubscriptionDialog: vi.fn()
+}))
 vi.mock('vue-i18n', async () => {
   const actual = await vi.importActual('vue-i18n')
   return {
@@ -207,11 +212,31 @@ vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
 
 vi.mock('@/composables/billing/useBillingContext', () => ({
   useBillingContext: vi.fn(() => ({
-    canAccessSubscriptionFeatures: { value: true },
-    showSubscriptionDialog: vi.fn()
+    canAccessSubscriptionFeatures: {
+      get value() {
+        return mockBillingState.canAccessSubscriptionFeatures
+      }
+    },
+    showSubscriptionDialog: mockBillingState.showSubscriptionDialog
   }))
 }))
 
+vi.mock(
+  '@/platform/cloud/subscription/composables/useBillingPolicyCapabilities',
+  () => ({
+    useBillingPolicyCapabilities: () => ({
+      billingPolicyCapabilities: {
+        get value() {
+          return {
+            topUpAccess: 'allowed',
+            showsSubscribeUpsellUI: mockBillingState.showsSubscribeUpsellUI
+          }
+        }
+      }
+    })
+  })
+)
+
 describe('useCoreCommands', () => {
   const createMockNode = (id: number, comfyClass: string): LGraphNode => {
     const baseNode = createMockLGraphNode({ id })
@@ -302,6 +327,8 @@ describe('useCoreCommands', () => {
 
   beforeEach(() => {
     mockDistributionState.isCloud = false
+    mockBillingState.canAccessSubscriptionFeatures = true
+    mockBillingState.showsSubscribeUpsellUI = true
     vi.mocked(app.refreshComboInNodes).mockResolvedValue(undefined)
     mockModelStoreRefresh.mockResolvedValue(undefined)
     mockMissingModelStoreRefresh.mockResolvedValue(undefined)
@@ -316,6 +343,18 @@ describe('useCoreCommands', () => {
     global.confirm = vi.fn().mockReturnValue(true)
   })
 
+  it('does not open a subscribe dialog when the billing policy disables upsells', async () => {
+    mockBillingState.canAccessSubscriptionFeatures = false
+    mockBillingState.showsSubscribeUpsellUI = false
+    const queuePrompt = useCoreCommands().find(
+      (command) => command.id === 'Comfy.QueuePrompt'
+    )!
+
+    await queuePrompt.function()
+
+    expect(mockBillingState.showSubscriptionDialog).not.toHaveBeenCalled()
+  })
+
   describe('ClearWorkflow command', () => {
     it('should clear main graph when not in subgraph', async () => {
       const commands = useCoreCommands()
diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts
index 5c0ff3bc469..abb9211a412 100644
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -21,6 +21,7 @@ import {
 } from '@/lib/litegraph/src/litegraph'
 import type { Point } from '@/lib/litegraph/src/litegraph'
 import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useBillingPolicyCapabilities } from '@/platform/cloud/subscription/composables/useBillingPolicyCapabilities'
 import { useAssetBrowserDialog } from '@/platform/assets/composables/useAssetBrowserDialog'
 import { isCloud } from '@/platform/distribution/types'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
@@ -75,6 +76,7 @@ const moveSelectedNodesVersionAdded = '1.22.2'
 export function useCoreCommands(): ComfyCommand[] {
   const { canAccessSubscriptionFeatures, showSubscriptionDialog } =
     useBillingContext()
+  const { billingPolicyCapabilities } = useBillingPolicyCapabilities()
   const workflowService = useWorkflowService()
   const workflowStore = useWorkflowStore()
   const settingsDialog = useSettingsDialog()
@@ -100,6 +102,14 @@ export function useCoreCommands(): ComfyCommand[] {
     useSelectedLiteGraphItems()
   const getTracker = () => workflowStore.activeWorkflow?.changeTracker
 
+  function blockRunWithoutSubscription(): boolean {
+    if (canAccessSubscriptionFeatures.value) return false
+    if (billingPolicyCapabilities.value.showsSubscribeUpsellUI) {
+      showSubscriptionDialog({ reason: 'subscribe_to_run' })
+    }
+    return true
+  }
+
   function isQueuePanelV2Enabled() {
     return settingStore.get('Comfy.Queue.QPOV2')
   }
@@ -506,10 +516,7 @@ export function useCoreCommands(): ComfyCommand[] {
         trigger_source?: ExecutionTriggerSource
       }) => {
         trackRunButton(metadata)
-        if (!canAccessSubscriptionFeatures.value) {
-          showSubscriptionDialog({ reason: 'subscribe_to_run' })
-          return
-        }
+        if (blockRunWithoutSubscription()) return
 
         const batchCount = useQueueSettingsStore().batchCount
 
@@ -529,10 +536,7 @@ export function useCoreCommands(): ComfyCommand[] {
         trigger_source?: ExecutionTriggerSource
       }) => {
         trackRunButton(metadata)
-        if (!canAccessSubscriptionFeatures.value) {
-          showSubscriptionDialog({ reason: 'subscribe_to_run' })
-          return
-        }
+        if (blockRunWithoutSubscription()) return
 
         const batchCount = useQueueSettingsStore().batchCount
 
@@ -551,10 +555,7 @@ export function useCoreCommands(): ComfyCommand[] {
         trigger_source?: ExecutionTriggerSource
       }) => {
         trackRunButton(metadata)
-        if (!canAccessSubscriptionFeatures.value) {
-          showSubscriptionDialog({ reason: 'subscribe_to_run' })
-          return
-        }
+        if (blockRunWithoutSubscription()) return
 
         const batchCount = useQueueSettingsStore().batchCount
         const selectedNodes = getSelectedNodes()
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 02c66d75f7f..4373d880b24 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -2828,6 +2828,7 @@
     "planLoadError": "We couldn't load your plan details.",
     "planLoadErrorRetry": "Try again",
     "teamPlanName": "Team",
+    "unknownTierName": "Current plan",
     "teamPlanIncludes": "Your plan includes everything in {plan}, plus:",
     "inactiveTeamTitle": "Inactive team subscription",
     "inactiveTeamDescription": "Reactivate your team plan to add more members and run workflows",
@@ -2865,6 +2866,9 @@
       "free": {
         "name": "Free"
       },
+      "enterprise": {
+        "name": "Enterprise"
+      },
       "founder": {
         "name": "Founder's Edition"
       },
diff --git a/src/platform/cloud/subscription/billingPolicyCapabilities.test.ts b/src/platform/cloud/subscription/billingPolicyCapabilities.test.ts
index bfa043ac38a..c94e875b593 100644
--- a/src/platform/cloud/subscription/billingPolicyCapabilities.test.ts
+++ b/src/platform/cloud/subscription/billingPolicyCapabilities.test.ts
@@ -18,6 +18,10 @@ describe('getBillingPolicyCapabilities', () => {
       'LocalTeamWithoutActiveSubscription',
       { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     ],
+    [
+      'LocalEnterpriseWithoutActiveSubscription',
+      { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
+    ],
     [
       'LocalAndUnknown',
       { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
@@ -45,6 +49,10 @@ describe('getBillingPolicyCapabilities', () => {
       'CloudTeamWithoutActiveSubscription',
       { topUpAccess: 'subscription-required', showsSubscribeUpsellUI: false }
     ],
+    [
+      'CloudEnterpriseWithoutActiveSubscription',
+      { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
+    ],
     [
       'CloudAndUnknown',
       { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
diff --git a/src/platform/cloud/subscription/billingPolicyCapabilities.ts b/src/platform/cloud/subscription/billingPolicyCapabilities.ts
index a2989b49960..6d95b927993 100644
--- a/src/platform/cloud/subscription/billingPolicyCapabilities.ts
+++ b/src/platform/cloud/subscription/billingPolicyCapabilities.ts
@@ -20,6 +20,8 @@ export function getBillingPolicyCapabilities(
       return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     case 'LocalTeamWithoutActiveSubscription':
       return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
+    case 'LocalEnterpriseWithoutActiveSubscription':
+      return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     case 'LocalAndUnknown':
       return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     case 'LocalAndFree':
@@ -44,6 +46,8 @@ export function getBillingPolicyCapabilities(
         topUpAccess: 'subscription-required',
         showsSubscribeUpsellUI: false
       }
+    case 'CloudEnterpriseWithoutActiveSubscription':
+      return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     case 'CloudAndUnknown':
       return { topUpAccess: 'allowed', showsSubscribeUpsellUI: false }
     case 'CloudAndFree':
diff --git a/src/platform/cloud/subscription/billingPolicyState.ts b/src/platform/cloud/subscription/billingPolicyState.ts
index 436473f6337..17fc0a5c476 100644
--- a/src/platform/cloud/subscription/billingPolicyState.ts
+++ b/src/platform/cloud/subscription/billingPolicyState.ts
@@ -1,6 +1,7 @@
 export type BillingPolicyState =
   | { kind: 'LocalWithoutActiveSubscription' }
   | { kind: 'LocalTeamWithoutActiveSubscription' }
+  | { kind: 'LocalEnterpriseWithoutActiveSubscription' }
   | { kind: 'LocalAndUnknown' }
   | { kind: 'LocalAndFree' }
   | { kind: 'LocalAndStandard' }
@@ -10,6 +11,7 @@ export type BillingPolicyState =
   | { kind: 'LocalAndTeam' }
   | { kind: 'CloudWithoutActiveSubscription' }
   | { kind: 'CloudTeamWithoutActiveSubscription' }
+  | { kind: 'CloudEnterpriseWithoutActiveSubscription' }
   | { kind: 'CloudAndUnknown' }
   | { kind: 'CloudAndFree' }
   | { kind: 'CloudAndStandard' }
diff --git a/src/platform/cloud/subscription/components/CreditsTile.test.ts b/src/platform/cloud/subscription/components/CreditsTile.test.ts
index 13446b8fa64..cbcf146d5c4 100644
--- a/src/platform/cloud/subscription/components/CreditsTile.test.ts
+++ b/src/platform/cloud/subscription/components/CreditsTile.test.ts
@@ -6,6 +6,7 @@ import { createI18n } from 'vue-i18n'
 
 import type { BalanceInfo, SubscriptionInfo } from '@/composables/billing/types'
 import CreditsTile from '@/platform/cloud/subscription/components/CreditsTile.vue'
+import type { IngestSubscriptionTier } from '@/platform/cloud/subscription/constants/tierPricing'
 import type { TeamCreditStopSummary } from '@/platform/workspace/api/workspaceApi'
 
 type Balance = Pick<
@@ -18,6 +19,8 @@ type Subscription = Pick<SubscriptionInfo, 'duration' | 'renewalDate'> & {
 type TeamStop = TeamCreditStopSummary
 type CustomerEventsResult = { events: { event_type: string }[] } | null
 
+const runtimeTier = (tier: string) => tier as unknown as IngestSubscriptionTier
+
 const state = vi.hoisted(() => ({
   balance: null as Balance | null,
   subscription: null as Subscription | null,
@@ -337,6 +340,8 @@ describe('CreditsTile', () => {
 
   it('shows disabled credit details for an inactive plan', () => {
     activeProSubscription()
+    state.canAccessSubscriptionFeatures = false
+    state.tier = null
     const { container } = renderTile({ inactivePlan: true })
 
     expect(container.textContent).toContain('0remaining')
@@ -347,6 +352,31 @@ describe('CreditsTile', () => {
     expect(screen.queryByText('Add credits')).toBeNull()
   })
 
+  it('allows an inactive Enterprise workspace to add credits', () => {
+    activeProSubscription()
+    state.canAccessSubscriptionFeatures = false
+    state.tier = runtimeTier('ENTERPRISE')
+    const { container } = renderTile({ inactivePlan: true })
+
+    expect(container.textContent).not.toContain(
+      'Reactivate your plan to use these credits'
+    )
+    expect(screen.getByText('Add credits')).toBeInTheDocument()
+  })
+
+  it('does not borrow a catalog monthly pool for an unrecognized tier', () => {
+    activeProSubscription()
+    state.tier = runtimeTier('GALACTIC')
+    state.subscription = {
+      tier: runtimeTier('GALACTIC'),
+      duration: 'MONTHLY',
+      renewalDate: '2026-02-20T12:00:00Z'
+    }
+    const { container } = renderTile()
+
+    expect(container.textContent).not.toContain('left of')
+  })
+
   it('shows only the balance with no breakdown when there is no active subscription', () => {
     state.canAccessSubscriptionFeatures = false
     state.balance = { amountMicros: 500 }
diff --git a/src/platform/cloud/subscription/components/CreditsTile.vue b/src/platform/cloud/subscription/components/CreditsTile.vue
index fc4a3185024..67b6f03feda 100644
--- a/src/platform/cloud/subscription/components/CreditsTile.vue
+++ b/src/platform/cloud/subscription/components/CreditsTile.vue
@@ -156,7 +156,7 @@
       </div>
     </template>
 
-    <template v-else-if="inactivePlan">
+    <template v-else-if="showsInactivePlanState">
       <div class="h-px w-full bg-interface-stroke" />
       <div class="flex flex-col gap-2">
         <div class="flex items-center justify-between gap-2 text-sm">
@@ -231,6 +231,9 @@ import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables
 import { useBillingPolicyCapabilities } from '@/platform/cloud/subscription/composables/useBillingPolicyCapabilities'
 import {
   DEFAULT_TIER_KEY,
+  isEnterprisePlanSlug,
+  isEnterpriseTier,
+  isUnknownTier,
   toTierKey,
   getTierCredits
 } from '@/platform/cloud/subscription/constants/tierPricing'
@@ -283,13 +286,22 @@ const tierKey = computed(() => {
 const creditPoolTotalCredits = computed<number | null>(() => {
   const monthlyCredits =
     currentTeamCreditStop.value?.credits_monthly ??
-    getTierCredits(tierKey.value)
+    (isEnterpriseTier(subscription.value?.tier) ||
+    isEnterprisePlanSlug(subscription.value?.planSlug) ||
+    isUnknownTier(subscription.value?.tier)
+      ? null
+      : getTierCredits(tierKey.value))
   if (monthlyCredits === null) return null
   return subscription.value?.duration === 'ANNUAL'
     ? monthlyCredits * 12
     : monthlyCredits
 })
 
+const showsInactivePlanState = computed(
+  () =>
+    inactivePlan && billingPolicyCapabilities.value.topUpAccess !== 'allowed'
+)
+
 const usage = computed(() =>
   computeMonthlyUsage(
     monthlyBonusCreditsValue.value,
@@ -340,10 +352,14 @@ const creditPoolTotalCompact = computed(() => {
 })
 
 const displayTotal = computed(() =>
-  zeroState || inactivePlan ? formatCreditCount(0) : totalCredits.value
+  zeroState || showsInactivePlanState.value
+    ? formatCreditCount(0)
+    : totalCredits.value
 )
 const displayPrepaid = computed(() =>
-  zeroState || inactivePlan ? formatCreditCount(0) : prepaidCredits.value
+  zeroState || showsInactivePlanState.value
+    ? formatCreditCount(0)
+    : prepaidCredits.value
 )
 const usedBarWidth = computed(
   () => `${(usage.value.usedFraction * 100).toFixed(2)}%`
@@ -356,7 +372,10 @@ const monthlyUsageLabel = computed(() =>
 )
 
 const showBreakdown = computed(
-  () => canAccessSubscriptionFeatures.value && !zeroState && !inactivePlan
+  () =>
+    canAccessSubscriptionFeatures.value &&
+    !zeroState &&
+    !showsInactivePlanState.value
 )
 const showBar = computed(
   () =>
@@ -368,9 +387,9 @@ const showBar = computed(
 // including local/desktop) accounts have no workspace concept to gate on.
 const showActionButton = computed(
   () =>
-    canAccessSubscriptionFeatures.value &&
+    (billingPolicyCapabilities.value.topUpAccess === 'allowed' ||
+      billingPolicyCapabilities.value.showsSubscribeUpsellUI) &&
     !zeroState &&
-    !inactivePlan &&
     (type.value !== 'workspace' || permissions.value.canTopUp)
 )
 
diff --git a/src/platform/cloud/subscription/composables/useBillingPolicyState.test.ts b/src/platform/cloud/subscription/composables/useBillingPolicyState.test.ts
index e54d2ad5195..a2e2d6cc312 100644
--- a/src/platform/cloud/subscription/composables/useBillingPolicyState.test.ts
+++ b/src/platform/cloud/subscription/composables/useBillingPolicyState.test.ts
@@ -1,7 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
+import type { IngestSubscriptionTier } from '@/platform/cloud/subscription/constants/tierPricing'
+
 import { deriveBillingPolicyState } from './useBillingPolicyState'
 
+const runtimeTier = (tier: string) => tier as unknown as IngestSubscriptionTier
+
 describe('deriveBillingPolicyState', () => {
   it.for<[string, boolean]>([
     ['LocalWithoutActiveSubscription', false],
@@ -64,6 +68,66 @@ describe('deriveBillingPolicyState', () => {
     }
   )
 
+  it.for<[string, boolean]>([
+    ['LocalAndTeam', false],
+    ['CloudAndTeam', true]
+  ])(
+    'maps an active Enterprise plan to the team policy state %s (isCloud=%s)',
+    ([kind, isCloud]) => {
+      expect(
+        deriveBillingPolicyState({
+          isCloud,
+          canAccessSubscriptionFeatures: true,
+          isTeamPlan: false,
+          tier: runtimeTier('ENTERPRISE')
+        })
+      ).toEqual({ kind })
+    }
+  )
+
+  it.for<[string, boolean]>([
+    ['LocalEnterpriseWithoutActiveSubscription', false],
+    ['CloudEnterpriseWithoutActiveSubscription', true]
+  ])('maps a lapsed Enterprise plan to %s (isCloud=%s)', ([kind, isCloud]) => {
+    expect(
+      deriveBillingPolicyState({
+        isCloud,
+        canAccessSubscriptionFeatures: false,
+        isTeamPlan: false,
+        tier: runtimeTier('ENTERPRISE')
+      })
+    ).toEqual({ kind })
+  })
+
+  it('classifies enterprise from the plan slug when the tier is absent', () => {
+    expect(
+      deriveBillingPolicyState({
+        isCloud: true,
+        canAccessSubscriptionFeatures: false,
+        isTeamPlan: false,
+        tier: null,
+        planSlug: 'enterprise_monthly'
+      })
+    ).toEqual({ kind: 'CloudEnterpriseWithoutActiveSubscription' })
+  })
+
+  it.for<[string, boolean]>([
+    ['LocalAndUnknown', false],
+    ['CloudAndUnknown', true]
+  ])(
+    'degrades a tier outside the generated enum to %s instead of crashing (isCloud=%s)',
+    ([kind, isCloud]) => {
+      expect(
+        deriveBillingPolicyState({
+          isCloud,
+          canAccessSubscriptionFeatures: true,
+          isTeamPlan: false,
+          tier: runtimeTier('ULTRA')
+        })
+      ).toEqual({ kind })
+    }
+  )
+
   it.for<[string, boolean]>([
     ['LocalAndTeam', false],
     ['CloudAndTeam', true]
diff --git a/src/platform/cloud/subscription/composables/useBillingPolicyState.ts b/src/platform/cloud/subscription/composables/useBillingPolicyState.ts
index c107a7d9604..d1ba29b7082 100644
--- a/src/platform/cloud/subscription/composables/useBillingPolicyState.ts
+++ b/src/platform/cloud/subscription/composables/useBillingPolicyState.ts
@@ -2,6 +2,10 @@ import { computed } from 'vue'
 
 import { useBillingContext } from '@/composables/billing/useBillingContext'
 import type { IngestSubscriptionTier } from '@/platform/cloud/subscription/constants/tierPricing'
+import {
+  isEnterprisePlanSlug,
+  isEnterpriseTier
+} from '@/platform/cloud/subscription/constants/tierPricing'
 import { isCloud } from '@/platform/distribution/types'
 
 import type { BillingPolicyState } from '../billingPolicyState'
@@ -15,9 +19,23 @@ export function deriveBillingPolicyState(input: {
   canAccessSubscriptionFeatures: boolean
   isTeamPlan: boolean
   tier: IngestSubscriptionTier | null
+  planSlug?: string | null
 }): BillingPolicyState {
   const distribution = input.isCloud ? 'Cloud' : 'Local'
 
+  // ENTERPRISE arrives as a runtime string before the generated enum carries
+  // it. It is a workspace-level plan and never self-serve, so it takes the
+  // team policy states in both the active and lapsed cases — classifying a
+  // lapsed enterprise as plain WithoutActiveSubscription would expose the
+  // personal subscribe upsell.
+  if (isEnterpriseTier(input.tier) || isEnterprisePlanSlug(input.planSlug)) {
+    return {
+      kind: input.canAccessSubscriptionFeatures
+        ? `${distribution}AndTeam`
+        : `${distribution}EnterpriseWithoutActiveSubscription`
+    }
+  }
+
   if (input.isTeamPlan || input.tier === 'TEAM') {
     return {
       kind: input.canAccessSubscriptionFeatures
@@ -43,8 +61,10 @@ export function deriveBillingPolicyState(input: {
       return { kind: `${distribution}AndFounders` }
     case null:
       return { kind: `${distribution}AndUnknown` }
-    default:
-      return input.tier satisfies never
+    default: {
+      input.tier satisfies never
+      return { kind: `${distribution}AndUnknown` }
+    }
   }
 }
 
@@ -54,7 +74,7 @@ export function deriveBillingPolicyState(input: {
  * and the local backend stay exactly as they are today.
  */
 export function useBillingPolicyState() {
-  const { canAccessSubscriptionFeatures, isTeamPlan, tier } =
+  const { canAccessSubscriptionFeatures, isTeamPlan, tier, subscription } =
     useBillingContext()
 
   const billingPolicyState = computed<BillingPolicyState>(() =>
@@ -62,7 +82,8 @@ export function useBillingPolicyState() {
       isCloud,
       canAccessSubscriptionFeatures: canAccessSubscriptionFeatures.value,
       isTeamPlan: isTeamPlan.value,
-      tier: tier.value
+      tier: tier.value,
+      planSlug: subscription.value?.planSlug
     })
   )
 
diff --git a/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.test.ts b/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.test.ts
index 5c4b39591a0..83614d2ff87 100644
--- a/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.test.ts
+++ b/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.test.ts
@@ -49,10 +49,20 @@ const mockTeamCreditStops = vi.hoisted(() => ({
 }))
 const mockFetchPlans = vi.hoisted(() => vi.fn())
 
+const mockSubscription = vi.hoisted(() => ({
+  value: { tier: 'PRO', planSlug: 'pro-monthly' } as {
+    tier: string
+    planSlug: string
+  } | null
+}))
+const mockFetchStatus = vi.hoisted(() => vi.fn(() => Promise.resolve()))
+
 vi.mock('@/composables/billing/useBillingContext', () => ({
   useBillingContext: () => ({
     teamCreditStops: mockTeamCreditStops,
-    fetchPlans: mockFetchPlans
+    fetchPlans: mockFetchPlans,
+    subscription: mockSubscription,
+    fetchStatus: mockFetchStatus
   })
 }))
 
@@ -78,6 +88,8 @@ const TEAM_CREDIT_STOPS = {
 
 describe('usePricingTableUrlLoader', () => {
   beforeEach(() => {
+    mockSubscription.value = { tier: 'PRO', planSlug: 'pro-monthly' }
+    mockFetchStatus.mockClear()
     mockRouteQuery.value = {}
     mockPermissions.value = { canManageSubscription: true }
     mockTeamCreditStops.value = TEAM_CREDIT_STOPS
@@ -108,6 +120,52 @@ describe('usePricingTableUrlLoader', () => {
     expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
   })
 
+  it('never opens for an enterprise workspace', async () => {
+    mockRouteQuery.value = { pricing: '1' }
+    mockSubscription.value = {
+      tier: 'ENTERPRISE',
+      planSlug: 'enterprise_monthly'
+    }
+
+    const { loadPricingTableFromUrl } = usePricingTableUrlLoader()
+    await loadPricingTableFromUrl()
+
+    expect(mockShowPricingTable).not.toHaveBeenCalled()
+    expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
+  })
+
+  it('never opens for an unrecognized tier', async () => {
+    mockRouteQuery.value = { pricing: '1' }
+    mockSubscription.value = {
+      tier: 'GALACTIC',
+      planSlug: 'galactic_monthly'
+    }
+
+    const { loadPricingTableFromUrl } = usePricingTableUrlLoader()
+    await loadPricingTableFromUrl()
+
+    expect(mockShowPricingTable).not.toHaveBeenCalled()
+    expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
+  })
+
+  it('resolves billing status before deciding, catching a pre-load enterprise deep link', async () => {
+    mockRouteQuery.value = { pricing: '1' }
+    mockSubscription.value = null
+    mockFetchStatus.mockImplementation(() => {
+      mockSubscription.value = {
+        tier: 'ENTERPRISE',
+        planSlug: 'enterprise_monthly'
+      }
+      return Promise.resolve()
+    })
+
+    const { loadPricingTableFromUrl } = usePricingTableUrlLoader()
+    await loadPricingTableFromUrl()
+
+    expect(mockFetchStatus).toHaveBeenCalledOnce()
+    expect(mockShowPricingTable).not.toHaveBeenCalled()
+  })
+
   it('opens on the team tab for ?pricing=team', async () => {
     mockRouteQuery.value = { pricing: 'team' }
 
diff --git a/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.ts b/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.ts
index 8a6447fc106..7b47ceb1450 100644
--- a/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.ts
+++ b/src/platform/cloud/subscription/composables/usePricingTableUrlLoader.ts
@@ -1,6 +1,11 @@
 import { useRoute, useRouter } from 'vue-router'
 
 import { useBillingContext } from '@/composables/billing/useBillingContext'
+import {
+  isEnterprisePlanSlug,
+  isEnterpriseTier,
+  isUnknownTier
+} from '@/platform/cloud/subscription/constants/tierPricing'
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import {
   clearPreservedQuery,
@@ -102,7 +107,8 @@ export function usePricingTableUrlLoader() {
   const route = useRoute()
   const router = useRouter()
   const subscriptionDialog = useSubscriptionDialog()
-  const { teamCreditStops, fetchPlans } = useBillingContext()
+  const { subscription, teamCreditStops, fetchPlans, fetchStatus } =
+    useBillingContext()
   const { permissions } = useWorkspaceUI()
 
   /** Reads `?pricing=`, strips it, and opens the table when the gate allows. */
@@ -139,6 +145,27 @@ export function usePricingTableUrlLoader() {
     if (typeof param !== 'string' || !param) return
 
     if (!permissions.value.canManageSubscription) return
+    // Enterprise is sales-managed: the pricing table never opens for it, even
+    // from a deep link. The loader can run before billing status resolves, so
+    // fetch it rather than deciding on an absent subscription.
+    if (!subscription.value) {
+      try {
+        await fetchStatus()
+      } catch (error) {
+        console.error(
+          '[usePricingTableUrlLoader] Failed to load billing status:',
+          error
+        )
+        return
+      }
+    }
+    if (
+      isEnterpriseTier(subscription.value?.tier) ||
+      isEnterprisePlanSlug(subscription.value?.planSlug) ||
+      isUnknownTier(subscription.value?.tier)
+    ) {
+      return
+    }
 
     const teamCheckoutRequest = getTeamCheckoutRequest(
       param,
diff --git a/src/platform/cloud/subscription/constants/tierPricing.ts b/src/platform/cloud/subscription/constants/tierPricing.ts
index 84c3aa088b0..6bd58f5913b 100644
--- a/src/platform/cloud/subscription/constants/tierPricing.ts
+++ b/src/platform/cloud/subscription/constants/tierPricing.ts
@@ -58,7 +58,30 @@ export const DEFAULT_TIER_KEY: TierKey = 'standard'
 
 // TEAM is workspace-level, so it maps to no key in this personal plan catalog.
 export function toTierKey(tier: IngestSubscriptionTier): TierKey | null {
-  return tier === 'TEAM' ? null : TIER_TO_KEY[tier]
+  return tier === 'TEAM' ? null : (TIER_TO_KEY[tier] ?? null)
+}
+
+// ENTERPRISE is a sales-managed workspace tier: absent from the personal
+// catalog and (until the ingest enum ships it) from the generated types, so it
+// is matched as a runtime string. It never self-serves plan changes.
+const ENTERPRISE_TIER = 'ENTERPRISE'
+const ENTERPRISE_PLAN_SLUG_PREFIX = 'enterprise'
+
+export function isEnterpriseTier(tier: string | null | undefined): boolean {
+  return tier?.toUpperCase() === ENTERPRISE_TIER
+}
+
+export function isEnterprisePlanSlug(slug: string | null | undefined): boolean {
+  return slug?.toLowerCase().startsWith(ENTERPRISE_PLAN_SLUG_PREFIX) === true
+}
+
+// A tier the FE cannot map to its catalog (and that isn't the workspace-level
+// TEAM or sales-managed ENTERPRISE). It renders as "Current plan" with no
+// catalog content and no self-serve plan actions: price and feature claims
+// must never be borrowed for a plan we cannot identify (FE-1662 story 6).
+export function isUnknownTier(tier: string | null | undefined): boolean {
+  if (tier == null || tier === 'TEAM' || isEnterpriseTier(tier)) return false
+  return toTierKey(tier as IngestSubscriptionTier) === null
 }
 
 // Includes the workspace-level TEAM, which toTierKey maps to null: a catalog
diff --git a/src/platform/workspace/components/CurrentUserPopoverWorkspace.test.ts b/src/platform/workspace/components/CurrentUserPopoverWorkspace.test.ts
index 12d17aa201a..7e19f3574b0 100644
--- a/src/platform/workspace/components/CurrentUserPopoverWorkspace.test.ts
+++ b/src/platform/workspace/components/CurrentUserPopoverWorkspace.test.ts
@@ -17,6 +17,7 @@ const state = vi.hoisted(() => ({
   isFreeTier: false,
   isCancelled: false,
   planSlug: 'pro-monthly' as string | null,
+  tier: null as string | null,
   canTopUp: false,
   canManageSubscription: false,
   canManageSubscriptionLifecycle: false,
@@ -62,7 +63,8 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     isFreeTier: computed(() => state.isFreeTier),
     subscription: computed(() => ({
       isCancelled: state.isCancelled,
-      planSlug: state.planSlug
+      planSlug: state.planSlug,
+      tier: state.tier
     })),
     balance: ref({ amountMicros: 100 }),
     isLoading: ref(false),
@@ -166,6 +168,7 @@ describe('CurrentUserPopoverWorkspace', () => {
     state.isFreeTier = false
     state.isCancelled = false
     state.planSlug = 'pro-monthly'
+    state.tier = null
     state.canTopUp = false
     state.canManageSubscription = false
     state.canManageSubscriptionLifecycle = false
@@ -387,6 +390,40 @@ describe('CurrentUserPopoverWorkspace', () => {
     expect(state.showPricingTable).toHaveBeenCalledOnce()
   })
 
+  it('hides Resubscribe for a cancelled enterprise workspace', () => {
+    state.planSlug = 'enterprise_monthly'
+    state.isCancelled = true
+    state.canManageSubscription = true
+    state.canManageSubscriptionLifecycle = true
+    renderComponent('team')
+
+    expect(
+      screen.queryByRole('button', { name: 'Resubscribe' })
+    ).not.toBeInTheDocument()
+  })
+
+  it('hides Plans & pricing for an enterprise workspace but keeps Manage plan', () => {
+    state.planSlug = 'enterprise_monthly'
+    state.canManageSubscription = true
+    renderComponent('team')
+
+    expect(
+      screen.queryByTestId('plans-pricing-menu-item')
+    ).not.toBeInTheDocument()
+    expect(screen.getByTestId('manage-plan-menu-item')).toBeInTheDocument()
+  })
+
+  it('hides Plans & pricing for an unrecognized tier but keeps Manage plan', () => {
+    state.tier = 'GALACTIC'
+    state.canManageSubscription = true
+    renderComponent('team')
+
+    expect(
+      screen.queryByTestId('plans-pricing-menu-item')
+    ).not.toBeInTheDocument()
+    expect(screen.getByTestId('manage-plan-menu-item')).toBeInTheDocument()
+  })
+
   for (const workspaceType of ['personal', 'team'] as const) {
     it(`opens workspace plan management for a ${workspaceType} owner`, async () => {
       const user = userEvent.setup()
diff --git a/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
index 67825d862ef..3f2191fad6c 100644
--- a/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
+++ b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
@@ -236,6 +236,11 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 
 import { useExternalLink } from '@/composables/useExternalLink'
 import { useBillingContext } from '@/composables/billing/useBillingContext'
+import {
+  isEnterprisePlanSlug,
+  isEnterpriseTier,
+  isUnknownTier
+} from '@/platform/cloud/subscription/constants/tierPricing'
 import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import { isCloud } from '@/platform/distribution/types'
@@ -310,8 +315,14 @@ const displayedCredits = computed(() => {
   })
 })
 
+const isNonCatalogPlan = computed(
+  () =>
+    isEnterpriseTier(subscription.value?.tier) ||
+    isEnterprisePlanSlug(subscription.value?.planSlug) ||
+    isUnknownTier(subscription.value?.tier)
+)
 const showPlansAndPricing = computed(
-  () => permissions.value.canManageSubscription
+  () => permissions.value.canManageSubscription && !isNonCatalogPlan.value
 )
 const hasDelinquentSubscription = computed(
   () =>
@@ -326,10 +337,11 @@ const showManagePlan = computed(
 )
 const showSubscribeAction = computed(
   () =>
-    (isCancelled.value && permissions.value.canManageSubscriptionLifecycle) ||
-    (!canAccessSubscriptionFeatures.value &&
-      !hasDelinquentSubscription.value &&
-      permissions.value.canManageSubscription)
+    !isNonCatalogPlan.value &&
+    ((isCancelled.value && permissions.value.canManageSubscriptionLifecycle) ||
+      (!canAccessSubscriptionFeatures.value &&
+        !hasDelinquentSubscription.value &&
+        permissions.value.canManageSubscription))
 )
 
 const handleOpenUserSettings = () => {
diff --git a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts
index 090aaf79c09..573744b4812 100644
--- a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts
+++ b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts
@@ -118,6 +118,8 @@ const personalUiConfig: MenuUiConfig = {
 const mockUiConfig = ref<MenuUiConfig>(ownerUiConfig)
 
 const mockSubscriptionTier = ref<SubscriptionInfo['tier']>('PRO')
+const runtimeTier = (tier: string) =>
+  tier as unknown as SubscriptionInfo['tier']
 const mockPlanSlug = ref('team-monthly')
 const mockHasTeamPlan = ref(true)
 const mockPlans = ref<Plan[]>([
@@ -391,6 +393,85 @@ describe('SubscriptionPanelContentWorkspace', () => {
     )
   })
 
+  it('renders Enterprise without price, benefits, or a plan-change action', () => {
+    mockHasTeamPlan.value = false
+    mockPlanSlug.value = 'enterprise_monthly'
+    mockCurrentTeamCreditStop.value = null
+    renderComponent()
+
+    expect(screen.getByText('Enterprise')).toBeInTheDocument()
+    expect(
+      screen.queryByText('View more details about plans & pricing')
+    ).not.toBeInTheDocument()
+    expect(screen.queryByText('$665')).not.toBeInTheDocument()
+    expect(screen.queryByText('USD / mo')).not.toBeInTheDocument()
+    expect(
+      screen.queryByRole('button', { name: /change plan|upgrade plan/i })
+    ).not.toBeInTheDocument()
+    expect(
+      screen.getByText(`Renews on ${formatPanelDate(RENEWAL_DATE_ISO)}`)
+    ).toBeInTheDocument()
+  })
+
+  it('hides Reactivate for a cancelled enterprise plan', () => {
+    mockHasTeamPlan.value = false
+    mockPlanSlug.value = 'enterprise_monthly'
+    mockCurrentTeamCreditStop.value = null
+    mockSubscriptionStatus.value = 'canceled'
+    renderComponent()
+
+    expect(
+      screen.queryByRole('button', { name: /reactivate/i })
+    ).not.toBeInTheDocument()
+  })
+
+  it('offers no subscribe or reactivate path for an ended enterprise plan', () => {
+    mockHasTeamPlan.value = false
+    mockPlanSlug.value = 'enterprise_monthly'
+    mockCurrentTeamCreditStop.value = null
+    mockSubscriptionStatus.value = 'ended'
+    mockIsActiveSubscription.value = false
+    renderComponent()
+
+    expect(screen.getByText('Enterprise')).toBeInTheDocument()
+    expect(
+      screen.queryByRole('button', { name: /subscribe|reactivate/i })
+    ).not.toBeInTheDocument()
+  })
+
+  it('renders an unrecognized tier as Current plan without catalog content', () => {
+    mockHasTeamPlan.value = false
+    mockSubscriptionTier.value = runtimeTier('GALACTIC')
+    mockPlanSlug.value = 'galactic_monthly'
+    mockCurrentTeamCreditStop.value = null
+    renderComponent()
+
+    expect(screen.getByText('Current plan')).toBeInTheDocument()
+    expect(screen.queryByText('$665')).not.toBeInTheDocument()
+    expect(screen.queryByText('USD / mo')).not.toBeInTheDocument()
+    expect(
+      screen.queryByText('View more details about plans & pricing')
+    ).not.toBeInTheDocument()
+    expect(
+      screen.queryByRole('button', { name: /change plan|upgrade plan/i })
+    ).not.toBeInTheDocument()
+    expect(
+      screen.getByText(`Renews on ${formatPanelDate(RENEWAL_DATE_ISO)}`)
+    ).toBeInTheDocument()
+  })
+
+  it('labels a scheduled change to Enterprise outside the self-serve catalog', () => {
+    mockScheduledPlanSlug.value = 'enterprise_monthly'
+    mockChangeAt.value = END_DATE_ISO
+    renderComponent()
+
+    expect(
+      screen.getByText(
+        `Changes to Enterprise on ${formatPanelDate(END_DATE_ISO)}`
+      )
+    ).toBeInTheDocument()
+  })
+
   it('shows a scheduled plan change instead of the renewal date', () => {
     mockScheduledPlanSlug.value = 'pro-annual'
     mockChangeAt.value = END_DATE_ISO
diff --git a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue
index d4560f92180..72972acfeae 100644
--- a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue
+++ b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue
@@ -225,7 +225,10 @@
                     severity="warn"
                   />
                 </div>
-                <div class="flex items-baseline gap-1 font-inter">
+                <div
+                  v-if="!isNonCatalogPlan"
+                  class="flex items-baseline gap-1 font-inter"
+                >
                   <span class="text-2xl font-semibold">{{ displayPrice }}</span>
                   <span class="text-base">{{ priceUnitLabel }}</span>
                 </div>
@@ -262,7 +265,8 @@
                 <Button
                   v-if="
                     isSubscriptionCancelled &&
-                    permissions.canManageSubscriptionLifecycle
+                    permissions.canManageSubscriptionLifecycle &&
+                    !isNonCatalogPlan
                   "
                   size="lg"
                   variant="primary"
@@ -276,7 +280,8 @@
                   v-else-if="
                     !isSubscriptionCancelled &&
                     canAccessSubscriptionFeatures &&
-                    permissions.canManageSubscription
+                    permissions.canManageSubscription &&
+                    !isNonCatalogPlan
                   "
                   size="lg"
                   variant="secondary"
@@ -320,9 +325,10 @@
 
           <div
             v-if="
-              canAccessSubscriptionFeatures ||
-              isPersonalFree ||
-              showInactiveTeamSubscription
+              !isNonCatalogPlan &&
+              (canAccessSubscriptionFeatures ||
+                isPersonalFree ||
+                showInactiveTeamSubscription)
             "
             class="flex flex-col gap-2"
           >
@@ -382,7 +388,10 @@
       </div>
 
       <!-- View More Details - Outside main content -->
-      <div v-if="permissions.canManageSubscription" class="py-6">
+      <div
+        v-if="permissions.canManageSubscription && !isNonCatalogPlan"
+        class="py-6"
+      >
         <Button
           variant="muted-textonly"
           class="text-sm text-muted"
@@ -417,6 +426,11 @@ import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import { useFreeTierQuota } from '@/platform/cloud/subscription/composables/useFreeTierQuota'
 import type { TierBenefit } from '@/platform/cloud/subscription/utils/tierBenefits'
+import {
+  isEnterprisePlanSlug,
+  isEnterpriseTier,
+  isUnknownTier
+} from '@/platform/cloud/subscription/constants/tierPricing'
 import { getCommonTierBenefits } from '@/platform/cloud/subscription/utils/tierBenefits'
 import { isCloud } from '@/platform/distribution/types'
 import { useResubscribe } from '@/platform/workspace/composables/useResubscribe'
@@ -483,6 +497,9 @@ const isSubscriptionEnded = computed(() => {
 // stays active until its end date, so it keeps the subscribed treatment.
 const showSubscribePrompt = computed(() => {
   if (!permissions.value.canManageSubscription) return false
+  // Ended enterprise plans are reinstated by sales; unknown tiers cannot
+  // offer a checkout we can't price. Neither self-serves.
+  if (isNonCatalogPlan.value) return false
   if (isSubscriptionEnded.value) return true
   if (isSubscriptionCancelled.value) return false
   if (
@@ -562,13 +579,23 @@ const formattedChangeDate = computed(() =>
 )
 
 const scheduledPlanName = computed(() => {
+  const scheduledPlanSlug = subscription.value?.scheduledPlanSlug
+  if (isEnterprisePlanSlug(scheduledPlanSlug)) {
+    return t('subscription.tiers.enterprise.name')
+  }
   const scheduledPlan = plans.value.find(
-    (plan) => plan.slug === subscription.value?.scheduledPlanSlug
+    (plan) => plan.slug === scheduledPlanSlug
   )
   if (!scheduledPlan) return ''
+  if (isEnterpriseTier(scheduledPlan.tier)) {
+    return t('subscription.tiers.enterprise.name')
+  }
   if (scheduledPlan.slug.startsWith('team')) {
     return t('subscription.teamPlanName')
   }
+  if (isUnknownTier(scheduledPlan.tier)) {
+    return t('subscription.unknownTierName')
+  }
   return t(
     `subscription.tiers.${resolveSubscriptionTierKey(scheduledPlan.tier)}.name`
   )
@@ -627,10 +654,30 @@ const subscriptionTierName = computed(() => {
     : baseName
 })
 
-const planDisplayName = computed(() =>
-  isTeamPlan.value ? t('subscription.teamPlanName') : subscriptionTierName.value
+const isEnterprisePlan = computed(
+  () =>
+    isEnterpriseTier(subscription.value?.tier) ||
+    isEnterprisePlanSlug(subscription.value?.planSlug)
+)
+
+const isUnknownTierPlan = computed(() =>
+  isUnknownTier(subscription.value?.tier)
 )
 
+// Enterprise and unrecognized tiers share the same gate set: no catalog
+// content and no self-serve plan actions. Only the displayed name differs.
+const isNonCatalogPlan = computed(
+  () => isEnterprisePlan.value || isUnknownTierPlan.value
+)
+
+const planDisplayName = computed(() => {
+  if (isEnterprisePlan.value) return t('subscription.tiers.enterprise.name')
+  if (isUnknownTierPlan.value) return t('subscription.unknownTierName')
+  return isTeamPlan.value
+    ? t('subscription.teamPlanName')
+    : subscriptionTierName.value
+})
+
 const tierKey = computed(() =>
   resolveSubscriptionTierKey(subscription.value?.tier)
 )
@@ -643,6 +690,7 @@ const TEAM_PERK_KEYS = [
 ] as const
 
 const tierBenefits = computed((): TierBenefit[] => {
+  if (isNonCatalogPlan.value) return []
   if (isTeamActive.value || showInactiveTeamSubscription.value) {
     return TEAM_PERK_KEYS.map((key) => ({
       key,
diff --git a/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue
index 6140c992fb1..4d007962d47 100644
--- a/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue
+++ b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue
@@ -257,7 +257,7 @@ defineEmits<{
   back: []
 }>()
 
-const { t, n } = useI18n()
+const { t, te, n } = useI18n()
 const { subscription } = useBillingContext()
 
 function openVerification() {
@@ -266,7 +266,10 @@ function openVerification() {
 }
 
 function formatTierName(tier: string): string {
-  return t(`subscription.tiers.${tier.toLowerCase()}.name`)
+  const nameKey = `subscription.tiers.${tier.toLowerCase()}.name`
+  if (te(nameKey)) return t(nameKey)
+  const lower = tier.toLowerCase()
+  return lower.charAt(0).toUpperCase() + lower.slice(1)
 }
 
 function isTeamTier(tier: string): boolean {
diff --git a/src/platform/workspace/composables/useWorkspaceMenuItems.test.ts b/src/platform/workspace/composables/useWorkspaceMenuItems.test.ts
index 11de6ecc462..237604d69ee 100644
--- a/src/platform/workspace/composables/useWorkspaceMenuItems.test.ts
+++ b/src/platform/workspace/composables/useWorkspaceMenuItems.test.ts
@@ -13,6 +13,7 @@ const state = vi.hoisted(() => ({
   isFreeTier: false,
   isInPersonalWorkspace: false,
   planSlug: 'pro-monthly' as string | null,
+  tier: null as string | null,
   isSubscriptionCancelled: false
 }))
 
@@ -33,7 +34,8 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     isFreeTier: computed(() => state.isFreeTier),
     subscription: computed(() => ({
       endDate: '2026-08-01T00:00:00Z',
-      planSlug: state.planSlug
+      planSlug: state.planSlug,
+      tier: state.tier
     }))
   })
 }))
@@ -81,6 +83,7 @@ describe('useWorkspaceMenuItems', () => {
     state.isFreeTier = false
     state.isInPersonalWorkspace = false
     state.planSlug = 'pro-monthly'
+    state.tier = null
     state.isSubscriptionCancelled = false
   })
 
@@ -110,6 +113,39 @@ describe('useWorkspaceMenuItems', () => {
     )
   })
 
+  it('withholds cancellation from an enterprise plan', () => {
+    state.canManageSubscriptionLifecycle = true
+    state.planSlug = 'enterprise_monthly'
+
+    const { menuItems } = useWorkspaceMenuItems()
+
+    expect(menuItems.value.map((item) => item.label)).not.toContain(
+      'subscription.cancelPlan'
+    )
+  })
+
+  it('withholds cancellation from an enterprise tier with a non-enterprise slug', () => {
+    state.canManageSubscriptionLifecycle = true
+    state.tier = 'ENTERPRISE'
+
+    const { menuItems } = useWorkspaceMenuItems()
+
+    expect(menuItems.value.map((item) => item.label)).not.toContain(
+      'subscription.cancelPlan'
+    )
+  })
+
+  it('withholds cancellation from an unrecognized tier', () => {
+    state.canManageSubscriptionLifecycle = true
+    state.tier = 'GALACTIC'
+
+    const { menuItems } = useWorkspaceMenuItems()
+
+    expect(menuItems.value.map((item) => item.label)).not.toContain(
+      'subscription.cancelPlan'
+    )
+  })
+
   it('withholds cancellation for an already-cancelled plan', () => {
     state.canManageSubscriptionLifecycle = true
     state.isSubscriptionCancelled = true
@@ -250,6 +286,28 @@ describe('useWorkspaceMenuItems', () => {
     )
   })
 
+  it('hides Delete for an enterprise workspace owner', () => {
+    state.canManageSubscription = true
+    state.planSlug = 'enterprise_monthly'
+
+    const { menuItems } = useWorkspaceMenuItems()
+
+    expect(menuItems.value.map((item) => item.label)).not.toContain(
+      'workspacePanel.menu.deleteWorkspace'
+    )
+  })
+
+  it('keeps Leave available for an enterprise workspace member', () => {
+    state.canLeaveWorkspace = true
+    state.planSlug = 'enterprise_monthly'
+
+    const { menuItems } = useWorkspaceMenuItems()
+
+    expect(menuItems.value.map((item) => item.label)).toEqual([
+      'workspacePanel.menu.leaveWorkspace'
+    ])
+  })
+
   it('disables Delete while the additional workspace is subscribed', () => {
     state.canManageSubscription = true
     state.isDeleteDisabled = true
diff --git a/src/platform/workspace/composables/useWorkspaceMenuItems.ts b/src/platform/workspace/composables/useWorkspaceMenuItems.ts
index 798639c7fa6..9cd20a54d90 100644
--- a/src/platform/workspace/composables/useWorkspaceMenuItems.ts
+++ b/src/platform/workspace/composables/useWorkspaceMenuItems.ts
@@ -4,6 +4,11 @@ import { useI18n } from 'vue-i18n'
 import type { MenuItem } from 'primevue/menuitem'
 
 import { useBillingContext } from '@/composables/billing/useBillingContext'
+import {
+  isEnterprisePlanSlug,
+  isEnterpriseTier,
+  isUnknownTier
+} from '@/platform/cloud/subscription/constants/tierPricing'
 import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
 import { useDialogService } from '@/services/dialogService'
 
@@ -62,6 +67,12 @@ export function useWorkspaceMenuItems() {
     void showLeaveWorkspaceDialog()
   }
 
+  const isEnterprisePlan = computed(
+    () =>
+      isEnterpriseTier(subscription.value?.tier) ||
+      isEnterprisePlanSlug(subscription.value?.planSlug)
+  )
+
   const canCancelPlan = computed(
     () =>
       permissions.value.canManageSubscriptionLifecycle &&
@@ -70,12 +81,16 @@ export function useWorkspaceMenuItems() {
           billingStatus.value === 'paused') &&
           Boolean(subscription.value?.planSlug))) &&
       !isSubscriptionCancelled.value &&
-      !isFreeTier.value
+      !isFreeTier.value &&
+      !isEnterprisePlan.value &&
+      !isUnknownTier(subscription.value?.tier)
   )
 
   const canDeleteWorkspace = computed(
     () =>
-      permissions.value.canManageSubscription && !isInPersonalWorkspace.value
+      permissions.value.canManageSubscription &&
+      !isInPersonalWorkspace.value &&
+      !isEnterprisePlan.value
   )
 
   const deleteTooltip = computed(() => {
diff --git a/src/platform/workspace/composables/useWorkspaceTierLabel.test.ts b/src/platform/workspace/composables/useWorkspaceTierLabel.test.ts
index 1e8f69d872a..6906d9b49c4 100644
--- a/src/platform/workspace/composables/useWorkspaceTierLabel.test.ts
+++ b/src/platform/workspace/composables/useWorkspaceTierLabel.test.ts
@@ -12,7 +12,8 @@ vi.mock('vue-i18n', () => ({
         'subscription.tiers.standard.name': 'Standard',
         'subscription.tiers.creator.name': 'Creator',
         'subscription.tiers.pro.name': 'Pro',
-        'subscription.tiers.founder.name': "Founder's Edition"
+        'subscription.tiers.founder.name': "Founder's Edition",
+        'subscription.tiers.enterprise.name': 'Enterprise'
       }
       return tierNames[key] ?? key
     })
@@ -103,12 +104,30 @@ describe('useWorkspaceTierLabel', () => {
       expect(result).toBeNull()
     })
 
-    it('returns null when plan slug does not match any known tier', () => {
+    it('labels lowercase enterprise plan slugs', () => {
+      const result = getTierLabel({
+        isSubscribed: true,
+        subscriptionPlan: 'enterprise_monthly',
+        subscriptionTier: null
+      })
+      expect(result).toBe('Enterprise')
+    })
+
+    it('labels enterprise plan slugs', () => {
       const result = getTierLabel({
         isSubscribed: true,
         subscriptionPlan: 'ENTERPRISE_CUSTOM',
         subscriptionTier: null
       })
+      expect(result).toBe('Enterprise')
+    })
+
+    it('returns null when plan slug does not match any known tier', () => {
+      const result = getTierLabel({
+        isSubscribed: true,
+        subscriptionPlan: 'ULTRA_CUSTOM',
+        subscriptionTier: null
+      })
       expect(result).toBeNull()
     })
 
diff --git a/src/platform/workspace/composables/useWorkspaceTierLabel.ts b/src/platform/workspace/composables/useWorkspaceTierLabel.ts
index 2956c8c0c4d..b13f18ab538 100644
--- a/src/platform/workspace/composables/useWorkspaceTierLabel.ts
+++ b/src/platform/workspace/composables/useWorkspaceTierLabel.ts
@@ -8,7 +8,8 @@ const tierKeyMap: Record<string, string> = {
   CREATOR: 'creator',
   PRO: 'pro',
   FOUNDER: 'founder',
-  FOUNDERS_EDITION: 'founder'
+  FOUNDERS_EDITION: 'founder',
+  ENTERPRISE: 'enterprise'
 }
 
 interface WorkspaceSubscriptionInfo {
@@ -42,7 +43,7 @@ export function useWorkspaceTierLabel() {
 
     if (!workspace.subscriptionPlan) return null
 
-    const planSlug = workspace.subscriptionPlan
+    const planSlug = workspace.subscriptionPlan.toUpperCase()
     const tierMatch = Object.keys(tierKeyMap)
       .sort((a, b) => b.length - a.length)
       .find((tier) => planSlug === tier || planSlug.startsWith(`${tier}_`))
diff --git a/src/services/dialogService.renderer.test.ts b/src/services/dialogService.renderer.test.ts
index 46707ef6cd2..eb7f85d5d30 100644
--- a/src/services/dialogService.renderer.test.ts
+++ b/src/services/dialogService.renderer.test.ts
@@ -28,6 +28,7 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     canAccessSubscriptionFeatures: { value: true },
     isTeamPlan: { value: false },
     tier: { value: 'STANDARD' },
+    subscription: { value: null },
     type: { value: 'legacy' }
   })
 }))
diff --git a/src/services/dialogService.topUpCredits.test.ts b/src/services/dialogService.topUpCredits.test.ts
index 8767cf1990e..a23f6d47cec 100644
--- a/src/services/dialogService.topUpCredits.test.ts
+++ b/src/services/dialogService.topUpCredits.test.ts
@@ -47,6 +47,7 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     },
     isTeamPlan: { value: state.isTeamPlan },
     tier: { value: state.tier },
+    subscription: { value: null },
     type: { value: state.type }
   })
 }))