diff --git a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
index 49b8234d98..97f6219ea2 100644
--- a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
@@ -70,9 +70,10 @@
                     @{
                         var planTypes = Enum.GetValues<PlanType>()
                             .Where(p =>
-                                Model.Provider == null ||
-                                (Model.Provider != null
-                                 && p is >= PlanType.TeamsMonthly2019 and <= PlanType.EnterpriseAnnually2019 or >= PlanType.TeamsMonthly2020 and <= PlanType.EnterpriseAnnually)
+                                (Model.Provider == null ||
+                                p is >= PlanType.TeamsMonthly2019 and <= PlanType.EnterpriseAnnually2019 or
+                                    >= PlanType.TeamsMonthly2020 and <= PlanType.EnterpriseAnnually) &&
+                                p != PlanType.TeamsStarter
                             )
                             .Select(e => new SelectListItem
                             {
diff --git a/src/Core/Models/StaticStore/Plans/TeamsStarterPlan.cs b/src/Core/Models/StaticStore/Plans/TeamsStarterPlan.cs
index b1919376ea..9e308b5e57 100644
--- a/src/Core/Models/StaticStore/Plans/TeamsStarterPlan.cs
+++ b/src/Core/Models/StaticStore/Plans/TeamsStarterPlan.cs
@@ -28,6 +28,8 @@ public record TeamsStarterPlan : Plan
 
         PasswordManager = new TeamsStarterPasswordManagerFeatures();
         SecretsManager = new TeamsStarterSecretsManagerFeatures();
+
+        LegacyYear = 2024;
     }
 
     private record TeamsStarterSecretsManagerFeatures : SecretsManagerPlanFeatures