diff --git a/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx b/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx
index e5afe39dd3..f7154f65fb 100644
--- a/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx
+++ b/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx
@@ -6,6 +6,7 @@ import { usePricingModalStore } from "./pricing-modal-store";
 import { TabSelector } from "@storyteller/ui-tab-selector";
 import { invoke } from "@tauri-apps/api/core";
 import { SUBSCRIPTION_PLANS, SubscriptionPlanDetails } from "@storyteller/subscription";
+import { useSubscriptionState } from "@storyteller/subscription";
 
 const billingTabs = [
   { id: "yearly", label: "Yearly" },
@@ -22,20 +23,29 @@ const pricingConfig = {
 }
 
 interface PricingModalProps {
-  currentPlanId?: string;
-  hasActiveSubscription?: boolean;
+  //currentPlanId?: string;
+  //hasActiveSubscription?: boolean;
 }
 
 export function PricingModal({
-  currentPlanId,
-  hasActiveSubscription,
+  //currentPlanId,
+  //hasActiveSubscription,
 }: PricingModalProps = {}) {
-  const { isOpen, closeModal, subscription } = usePricingModalStore();
+  //const { isOpen, closeModal, subscription } = usePricingModalStore();
+  const { isOpen, closeModal } = usePricingModalStore();
+
+  const subscriptionStore = useSubscriptionState();
+
+  const hasActiveSub = subscriptionStore.hasPaidPlan();
+
+  const activePlanId = subscriptionStore.subscriptionInfo?.productSlug;
+
+  //// Use props if provided or fall back to store
+  //const activePlanId = currentPlanId ?? subscription.currentPlanId;
+
+  //const hasActiveSub =
+  //  hasActiveSubscription ?? subscription.hasActiveSubscription;
 
-  // Use props if provided or fall back to store
-  const activePlanId = currentPlanId ?? subscription.currentPlanId;
-  const hasActiveSub =
-    hasActiveSubscription ?? subscription.hasActiveSubscription;
   const [billingType, setBillingType] = useState("yearly");
   const isYearly = billingType === "yearly";
 
diff --git a/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx b/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx
index 7b8fa6bd7a..24cfdf764f 100644
--- a/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx
+++ b/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx
@@ -128,12 +128,14 @@ const ChangePlanButton = () => {
       }
     });
   }
+  const { toggleModal } = usePricingModalStore();
 
   return (
     <Button
       variant="primary"
       className="h-[30px]"
-      onClick={handleClick}
+      //onClick={handleClick}
+      onClick={() => toggleModal()}
     >
       Change plan
     </Button>