diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.components.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.components.tsx
index 6c679a14c1f..e701eb9efd5 100644
--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.components.tsx
+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.components.tsx
@@ -94,11 +94,16 @@ export function getContractIneligibilityDescription(
 ) {
   switch (reason) {
     case 'AWS_ACTIVATE_CREDITS_DEAL':
-      return 'No further action is required for this AWS Activate credits offer'
+      return 'This private offer grants you credits on the Supabase platform'
     case 'AGREEMENT_BASED_OFFER':
       return 'This private offer updated an existing AWS Marketplace subscription'
-    case 'NO_ACTIVE_CONTRACT_FOUND':
+    case 'NO_CONTRACT_FOUND':
+    case 'CONTRACT_IN_SETTLING_WINDOW':
       return 'AWS is still syncing this Marketplace subscription'
+    case 'CONTRACT_INACTIVE':
+      return ''
+    case 'CONTRACT_TERMINATED_EARLY':
+      return 'Subscription was terminated'
     default:
       return 'This AWS Marketplace subscription cannot be linked right now'
   }
@@ -114,7 +119,7 @@ export function ContractIneligibilityNotice({
       return (
         <Admonition
           type="success"
-          title="Credits accepted"
+          title="No action required"
           description="Your Supabase organization credit balance will be updated after AWS finishes processing the offer. This can take 1 or 2 days."
         />
       )
@@ -126,7 +131,8 @@ export function ContractIneligibilityNotice({
           description="Your existing Supabase organization remains linked to AWS Marketplace and your projects will continue to run as usual."
         />
       )
-    case 'NO_ACTIVE_CONTRACT_FOUND':
+    case 'NO_CONTRACT_FOUND':
+    case 'CONTRACT_IN_SETTLING_WINDOW':
       return (
         <Admonition
           type="warning"
@@ -134,6 +140,22 @@ export function ContractIneligibilityNotice({
           description="Thanks for purchasing Supabase through AWS Marketplace. It can take a few minutes before the subscription is ready to link. Try again shortly."
         />
       )
+    case 'CONTRACT_INACTIVE':
+      return (
+        <Admonition
+          type="warning"
+          title="No active subscription"
+          description="There is currently no active subscription to the Supabase product associated with your AWS account."
+        />
+      )
+    case 'CONTRACT_TERMINATED_EARLY':
+      return (
+        <Admonition
+          type="warning"
+          title="Action required"
+          description="Your subscription was terminated by AWS. Please review your payment method and billing settings in AWS."
+        />
+      )
     default:
       return <Admonition type="default" description="If the problem persists, contact support." />
   }
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index 8ddbcaaecf4..836d4c4de6d 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -5155,7 +5155,10 @@ export interface components {
         reasons: (
           | 'AWS_ACTIVATE_CREDITS_DEAL'
           | 'AGREEMENT_BASED_OFFER'
-          | 'NO_ACTIVE_CONTRACT_FOUND'
+          | 'NO_CONTRACT_FOUND'
+          | 'CONTRACT_INACTIVE'
+          | 'CONTRACT_TERMINATED_EARLY'
+          | 'CONTRACT_IN_SETTLING_WINDOW'
         )[]
       }
     }