diff --git a/api/src/billing/billing.service.ts b/api/src/billing/billing.service.ts
index 598bec6..a1c132e 100644
--- a/api/src/billing/billing.service.ts
+++ b/api/src/billing/billing.service.ts
@@ -126,14 +126,14 @@ export class BillingService {
     const user = await this.userModel.findById(new Types.ObjectId(userId))
     const plans = await this.planModel.find()
 
-    const customPlan = plans.find((plan) => plan.name === 'custom')
+    const customPlans = plans.filter((plan) => plan.name?.startsWith('custom'))
     const proPlan = plans.find((plan) => plan.name === 'pro')
     const freePlan = plans.find((plan) => plan.name === 'free')
 
     const customPlanSubscription = await this.subscriptionModel.findOne({
       user: user._id,
-      plan: customPlan._id,
-      isActive: true,
+        plan: { $in: customPlans.map((plan) => plan._id) },
+        isActive: true,
     })
 
     if (customPlanSubscription) {
@@ -321,7 +321,7 @@ export class BillingService {
         plan = await this.planModel.findById(subscription.plan)
       }
 
-      if (plan.name === 'custom') {
+      if (plan.name?.startsWith('custom')) {
         // TODO: for now custom plans are unlimited
         return true
       }
diff --git a/web/app/(app)/dashboard/(components)/upgrade-to-pro-alert.tsx b/web/app/(app)/dashboard/(components)/upgrade-to-pro-alert.tsx
index ab45303..a7c869d 100644
--- a/web/app/(app)/dashboard/(components)/upgrade-to-pro-alert.tsx
+++ b/web/app/(app)/dashboard/(components)/upgrade-to-pro-alert.tsx
@@ -51,7 +51,7 @@ export default function UpgradeToProAlert() {
     return null
   }
 
-  if (['pro', 'custom'].includes(currentSubscription?.plan?.name)) {
+  if (currentSubscription?.plan?.name !== 'free') {
     return null
   }