diff --git a/apps/start/src/components/organization/billing-prompt.tsx b/apps/start/src/components/organization/billing-prompt.tsx
index ad361f6c..1b774c37 100644
--- a/apps/start/src/components/organization/billing-prompt.tsx
+++ b/apps/start/src/components/organization/billing-prompt.tsx
@@ -87,7 +87,7 @@ export default function BillingPrompt({
     op.track('billing_prompt_viewed', {
       type,
     });
-  }, []);
+  }, [type]);
 
   const price = bestProductFit
     ? new Intl.NumberFormat('en-US', {
diff --git a/apps/start/src/modals/billing-success.tsx b/apps/start/src/modals/billing-success.tsx
index 1cdc5cd1..748717f6 100644
--- a/apps/start/src/modals/billing-success.tsx
+++ b/apps/start/src/modals/billing-success.tsx
@@ -37,9 +37,9 @@ export default function BillingSuccess() {
           Subscription updated successfully
         </h2>
         <p className="text-center mb-12 max-w-md text-base leading-normal">
-          Thanks you for your purchase! You have now full access to OpenPanel.
-          If you have any questions or feedback, please don't hesitate to
-          contact us.
+          Thank you for your purchase! You have now full access to OpenPanel. If
+          you have any questions or feedback, please don't hesitate to contact
+          us.
         </p>
       </div>
     </ModalContent>
diff --git a/apps/start/src/modals/select-billing-plan.tsx b/apps/start/src/modals/select-billing-plan.tsx
index 40260673..3f0c6460 100644
--- a/apps/start/src/modals/select-billing-plan.tsx
+++ b/apps/start/src/modals/select-billing-plan.tsx
@@ -272,8 +272,8 @@ export default function SelectBillingPlan({
               : 0;
 
             const isProductDisabled =
-              limit > 0 &&
-              organization.subscriptionPeriodEventsCount >= limit &&
+              (limit > 0 &&
+                organization.subscriptionPeriodEventsCount >= limit) ||
               !!product.disabled;
 
             return (