diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index f79b33f5b8..afcd9cb18d 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -236,7 +236,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
           plan.product === ProductType.TeamsStarter) &&
         (this.currentProductType !== ProductType.TeamsStarter ||
           plan.product === ProductType.Teams ||
-          plan.product === ProductType.Enterprise)
+          plan.product === ProductType.Enterprise) &&
+        (!this.providerId || plan.product !== ProductType.TeamsStarter)
     );
 
     result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder);
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
index 758c812035..5fe6d58425 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
@@ -27,6 +27,7 @@ const DisallowedPlanTypes = [
   PlanType.Free,
   PlanType.FamiliesAnnually2019,
   PlanType.FamiliesAnnually,
+  PlanType.TeamsStarter,
 ];
 
 @Component({