1 files changed, 10 insertions, 2 deletions

diff --git a/src/helpers/plan-helpers.js b/src/helpers/plan-helpers.js
index ee22e4471..b474f8bbd 100644
--- a/src/helpers/plan-helpers.js
+++ b/src/helpers/plan-helpers.js
@@ -20,6 +20,10 @@ const messages = defineMessages({
   },
 });
 
+export function cleanupPlanId(id) {
+  return id.replace(/(.*)-x[0-9]/, '$1');
+}
+
 export function i18nPlanName(planId, intl) {
   if (!planId) {
     throw new Error('planId is required');
@@ -29,7 +33,9 @@ export function i18nPlanName(planId, intl) {
     throw new Error('intl context is required');
   }
 
-  const plan = PLANS_MAPPING[planId];
+  const id = cleanupPlanId(planId);
+
+  const plan = PLANS_MAPPING[id];
 
   return intl.formatMessage(messages[plan]);
 }
@@ -39,7 +45,9 @@ export function getPlan(planId) {
     throw new Error('planId is required');
   }
 
-  const plan = PLANS_MAPPING[planId];
+  const id = cleanupPlanId(planId);
+
+  const plan = PLANS_MAPPING[id];
 
   return plan;
 }