diff --git a/packages/frontend-2/components/settings/workspaces/billing/Page.vue b/packages/frontend-2/components/settings/workspaces/billing/Page.vue
index 681e95cd7..0d0f86270 100644
--- a/packages/frontend-2/components/settings/workspaces/billing/Page.vue
+++ b/packages/frontend-2/components/settings/workspaces/billing/Page.vue
@@ -26,25 +26,30 @@
         <SettingsWorkspacesBillingUsage :slug="slug" />
       </section>
 
-      <ClientOnly>
-        <section class="flex flex-col gap-y-4 md:gap-y-6">
-          <SettingsSectionHeader title="Upgrade your plan" subheading />
-          <PricingTable
-            :slug="slug"
-            :workspace-id="workspace?.id"
-            :role="workspace?.role as WorkspaceRoles"
-            :currency="workspace?.subscription?.currency"
-            :is-yearly-interval-selected="
-              workspace?.subscription?.billingInterval === BillingInterval.Yearly
-            "
-          />
-        </section>
+      <template v-if="showPricingInfo">
+        <ClientOnly>
+          <section class="flex flex-col gap-y-4 md:gap-y-6">
+            <SettingsSectionHeader title="Upgrade your plan" subheading />
+            <PricingTable
+              :slug="slug"
+              :workspace-id="workspace?.id"
+              :role="workspace?.role as WorkspaceRoles"
+              :currency="workspace?.subscription?.currency"
+              :is-yearly-interval-selected="
+                workspace?.subscription?.billingInterval === BillingInterval.Yearly
+              "
+            />
+          </section>
 
-        <section class="flex flex-col gap-y-4 md:gap-y-6">
-          <SettingsSectionHeader title="Add-ons" subheading />
-          <SettingsWorkspacesBillingAddOns :slug="slug" :workspace-id="workspace?.id" />
-        </section>
-      </ClientOnly>
+          <section class="flex flex-col gap-y-4 md:gap-y-6">
+            <SettingsSectionHeader title="Add-ons" subheading />
+            <SettingsWorkspacesBillingAddOns
+              :slug="slug"
+              :workspace-id="workspace?.id"
+            />
+          </section>
+        </ClientOnly>
+      </template>
     </div>
   </div>
 </template>
@@ -52,7 +57,11 @@
 <script lang="ts" setup>
 import { useQuery } from '@vue/apollo-composable'
 import { settingsWorkspaceBillingQuery } from '~/lib/settings/graphql/queries'
-import { type WorkspaceRoles, workspaceReachedPlanLimit } from '@speckle/shared'
+import {
+  type WorkspaceRoles,
+  workspaceReachedPlanLimit,
+  isSelfServeAvailablePlan
+} from '@speckle/shared'
 import { useWorkspacePlan } from '~~/lib/workspaces/composables/plan'
 import { graphql } from '~/lib/common/generated/gql'
 import {
@@ -107,4 +116,8 @@ const reachedPlanLimit = computed(() =>
     workspace.value?.plan?.usage?.modelCount
   )
 )
+const showPricingInfo = computed(() => {
+  if (!workspace.value?.plan?.name) return false
+  return isSelfServeAvailablePlan(workspace.value.plan.name)
+})
 </script>
diff --git a/packages/frontend-2/components/workspace/discoverableWorkspaces/Modal.vue b/packages/frontend-2/components/workspace/discoverableWorkspaces/Modal.vue
index abba4b379..6787ea553 100644
--- a/packages/frontend-2/components/workspace/discoverableWorkspaces/Modal.vue
+++ b/packages/frontend-2/components/workspace/discoverableWorkspaces/Modal.vue
@@ -18,7 +18,7 @@
         location="workspace_switcher"
       />
       <FormButton
-        v-if="!showAllWorkspaces"
+        v-if="!showAllWorkspaces && discoverableWorkspacesAndJoinRequestsCount > 3"
         color="subtle"
         size="lg"
         full-width