diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
index 370abfe349..df3aca4b50 100644
--- a/src/lib/layout/containerButton.svelte
+++ b/src/lib/layout/containerButton.svelte
@@ -10,10 +10,10 @@
 
     export let title: string;
     export let tooltipContent =
-        $organization?.billingPlanDetails.group === BillingPlanGroup.Starter
+        $organization?.billingPlanDetails?.group === BillingPlanGroup.Starter
             ? `Upgrade to add more ${title.toLocaleLowerCase()}`
             : `You've reached the ${title.toLocaleLowerCase()} limit for the ${
-                  $organization?.billingPlanDetails.name
+                  $organization?.billingPlanDetails?.name
               } plan`;
 
     export let disabled: boolean;