diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte
index 5680367c6..16b5dc6d7 100644
--- a/src/lib/components/breadcrumbs.svelte
+++ b/src/lib/components/breadcrumbs.svelte
@@ -253,7 +253,7 @@
 
     let badgeType: 'success' | undefined;
     $: badgeType =
-        $organization && $organization.billingPlanDetails.group !== BillingPlanGroup.Starter
+        $organization && $organization?.billingPlanDetails?.group !== BillingPlanGroup.Starter
             ? 'success'
             : undefined;
 </script>
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 508e5e85c..cbce2be03 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -302,6 +302,7 @@ export function checkForProjectLimitation(plan: string, id: PlanServices) {
 
 export function isServiceLimited(serviceId: PlanServices, plan: string, total: number) {
     if (!total) return false;
+    if (!plan) return false;
     const limit = getServiceLimit(serviceId) || Infinity;
     const isLimited = limit !== 0 && limit < Infinity;
     const hasUsageFees = checkForUsageFees(plan, serviceId);
diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index bf340ab13..ca9969cc0 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -44,7 +44,7 @@
 
     // Calculate if button should be disabled and tooltip should show
     $: memberCount = data.organizationMembers?.total ?? 0;
-    $: supportsMembers = $organization?.billingPlanDetails.addons.seats;
+    $: supportsMembers = $organization?.billingPlanDetails?.addons?.seats;
     $: isFreeWithMembers = !supportsMembers && memberCount >= 1;
     $: isButtonDisabled = isCloud ? isFreeWithMembers : false;
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte
index 24b41fe63..bf12af386 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte
@@ -23,7 +23,7 @@
                 title="Policies"
                 buttonText="Create policy"
                 buttonType="secondary"
-                buttonDisabled={true} />
+                buttonDisabled />
 
             <img
                 src={$app.themeInUse === 'dark'
@@ -41,7 +41,7 @@
                 title="Policies"
                 buttonText="Create policy"
                 buttonType="secondary"
-                buttonDisabled={true} />
+                buttonDisabled />
 
             <img
                 src={$app.themeInUse === 'dark'
@@ -60,7 +60,7 @@
                         title="Policies"
                         buttonText="Create policy"
                         buttonType="secondary"
-                        buttonDisabled={true} />
+                        buttonDisabled />
                 </div>
 
                 <div style="width: 69%; padding-inline-start: 1.5rem;">
@@ -68,7 +68,7 @@
                         title="Backups"
                         buttonText="Manual backup"
                         buttonType="secondary"
-                        buttonDisabled={true} />
+                        buttonDisabled />
                 </div>
             </div>