diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index c4324b623..593838924 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -123,7 +123,7 @@ export function planHasGroup(
 export function getBasePlanFromGroup(billingPlanGroup: BillingPlanGroup): Models.BillingPlan {
     const plansInfoStore = getPlansInfoStore();
 
-    const proPlans = Array.from(plansInfoStore?.values()).filter(
+    const proPlans = Array.from(plansInfoStore.values()).filter(
         (plan) => plan.group === billingPlanGroup
     );
 
diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index 19dba97b5..3d1ad1093 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -59,7 +59,7 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
     }
 
     // just in case!
-    plansInfoStore.set(plansInfo);
+    plansInfoStore.set(fallbackPlansInfoArray);
 
     return {
         roles: [],