diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index ef581a0eb..711be9bef 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -291,6 +291,7 @@ export type Plan = {
     backupsEnabled: boolean;
     backupPolicies: number;
     emailBranding: boolean;
+    supportsCredit: boolean;
 };
 
 export type PlansInfo = {
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index 3d05ac3a6..d71c709d8 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -132,7 +132,7 @@
                     </CollapsibleItem>
                 {/if}
 
-                {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
+                {#if currentPlan.supportsCredit && availableCredit > 0}
                     <CollapsibleItem noContent gap={4}>
                         <span class="body-text-2 u-flex u-cross-center u-gap-2"
                             ><svg
@@ -206,7 +206,7 @@
                 <div class="u-flex u-gap-16 u-flex-wrap">
                     <Button
                         text
-                        disabled={$organization?.markedForDeletion}
+                        disabled={($organization?.markedForDeletion || $organization.billingPlanDowngrade !== null)}
                         href={$upgradeURL}
                         on:click={() =>
                             trackEvent('click_organization_plan_update', {