diff --git a/src/Core/Models/Business/SponsorOrganizationSubscriptionUpdate.cs b/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
similarity index 86%
rename from src/Core/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
rename to src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
index 59a745297b0c..830105e37349 100644
--- a/src/Core/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
+++ b/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
@@ -1,6 +1,7 @@
-using Stripe;
+using Bit.Core.Models.Business;
+using Stripe;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.Billing.Models.Business;
 
 public class SponsorOrganizationSubscriptionUpdate : SubscriptionUpdate
 {
@@ -9,10 +10,11 @@ public class SponsorOrganizationSubscriptionUpdate : SubscriptionUpdate
     private readonly bool _applySponsorship;
     protected override List<string> PlanIds => new() { _existingPlanStripeId, _sponsoredPlanStripeId };
 
-    public SponsorOrganizationSubscriptionUpdate(StaticStore.Plan existingPlan, StaticStore.SponsoredPlan sponsoredPlan, bool applySponsorship)
+    public SponsorOrganizationSubscriptionUpdate(Core.Models.StaticStore.Plan existingPlan, Core.Models.StaticStore.SponsoredPlan sponsoredPlan, bool applySponsorship)
     {
         _existingPlanStripeId = existingPlan.PasswordManager.StripePlanId;
-        _sponsoredPlanStripeId = sponsoredPlan?.StripePlanId;
+        _sponsoredPlanStripeId = sponsoredPlan?.StripePlanId
+                                 ?? Core.Utilities.StaticStore.SponsoredPlans.FirstOrDefault()?.StripePlanId;
         _applySponsorship = applySponsorship;
     }
 
diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs
index 7d1776220ecc..21db1e6e5155 100644
--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Models;
+using Bit.Core.Billing.Models.Business;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;