diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index 2beb13b03..f0f363d56 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -19,7 +19,7 @@ export type Organization = Models.Team<Record<string, unknown>> & {
     billingAddressId?: string;
     amount: number;
     billingTaxId?: string;
-    billingPlanDowngrade?: string;
+    billingPlanDowngrade?: Tier;
 };
 
 export type OrganizationList = {
diff --git a/src/routes/console/organization-[organization]/billing/+page.svelte b/src/routes/console/organization-[organization]/billing/+page.svelte
index 98773c429..30720f912 100644
--- a/src/routes/console/organization-[organization]/billing/+page.svelte
+++ b/src/routes/console/organization-[organization]/billing/+page.svelte
@@ -111,8 +111,8 @@
     {/if}
     {#if $organization?.billingPlanDowngrade}
         <Alert type="info" class="common-section">
-            Your organization will change to a {tierToPlan(BillingPlan.FREE).name} plan once your current
-            billing cycle ends and your invoice is paid on {toLocaleDate(
+            Your organization will change to a {tierToPlan($organization?.billingPlanDowngrade)
+                .name} plan once your current billing cycle ends and your invoice is paid on {toLocaleDate(
                 $organization.billingNextInvoiceDate
             )}.
         </Alert>
diff --git a/src/routes/console/organization-[organization]/change-plan/+page.svelte b/src/routes/console/organization-[organization]/change-plan/+page.svelte
index e0d81bb37..d3c4d62e1 100644
--- a/src/routes/console/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/console/organization-[organization]/change-plan/+page.svelte
@@ -111,9 +111,9 @@
     }
 
     async function handleSubmit() {
-        if (billingPlan === BillingPlan.FREE) {
+        if (isDowngrade) {
             await downgrade();
-        } else {
+        } else if (isUpgrade) {
             await upgrade();
         }
     }