diff --git a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
index 5c43da628..962e3fbec 100644
--- a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
@@ -74,7 +74,7 @@
                                 (Model.Provider == null ||
                                 p is >= PlanType.TeamsMonthly2019 and <= PlanType.EnterpriseAnnually2019 or
                                     >= PlanType.TeamsMonthly2020 and <= PlanType.EnterpriseAnnually) &&
-                                p != PlanType.TeamsStarter
+                                (Model.PlanType == PlanType.TeamsStarter || p is not PlanType.TeamsStarter)
                             )
                             .Select(e => new SelectListItem
                             {