diff --git a/frontend/src/helpers/platform.ts b/frontend/src/helpers/platform.ts
index 821febcb8..73aaeb4ea 100644
--- a/frontend/src/helpers/platform.ts
+++ b/frontend/src/helpers/platform.ts
@@ -1,4 +1,5 @@
 export const isInfisicalCloud = () =>
   window.location.origin.includes("https://app.infisical.com") ||
   window.location.origin.includes("https://us.infisical.com") ||
-  window.location.origin.includes("https://eu.infisical.com");
+  window.location.origin.includes("https://eu.infisical.com") ||
+  window.location.origin.includes("https://gamma.infisical.com");
diff --git a/frontend/src/pages/organization/BillingPage/components/BillingCloudTab/PreviewSection.tsx b/frontend/src/pages/organization/BillingPage/components/BillingCloudTab/PreviewSection.tsx
index ac5f72bcc..5741722bd 100644
--- a/frontend/src/pages/organization/BillingPage/components/BillingCloudTab/PreviewSection.tsx
+++ b/frontend/src/pages/organization/BillingPage/components/BillingCloudTab/PreviewSection.tsx
@@ -9,6 +9,7 @@ import {
   useOrganization,
   useSubscription
 } from "@app/context";
+import { isInfisicalCloud } from "@app/helpers/platform";
 import {
   useCreateCustomerPortalSession,
   useGetOrgPlanBillingInfo,
@@ -47,19 +48,17 @@ export const PreviewSection = () => {
   };
 
   function formatPlanSlug(slug: string) {
+    if (!slug) {
+      return "-";
+    }
     return slug.replace(/(\b[a-z])/g, (match) => match.toUpperCase()).replace(/-/g, " ");
   }
 
-  const isCloudInstance =
-    window.location.origin.includes("https://app.infisical.com") ||
-    window.location.origin.includes("https://eu.infisical.com") ||
-    window.location.origin.includes("https://gamma.infisical.com");
-
   const handleUpgradeBtnClick = async () => {
     try {
       if (!subscription || !currentOrg) return;
 
-      if (!isCloudInstance) {
+      if (!isInfisicalCloud()) {
         window.open("https://infisical.com/pricing", "_blank");
         return;
       }
@@ -82,7 +81,7 @@ export const PreviewSection = () => {
   };
 
   const getUpgradePlanLabel = () => {
-    if (!isCloudInstance) {
+    if (!isInfisicalCloud()) {
       return (
         <div>
           Go to Pricing
@@ -156,7 +155,7 @@ export const PreviewSection = () => {
                 subscription.status === "trialing" ? "(Trial)" : ""
               }`}
             </p>
-            {isCloudInstance && (
+            {isInfisicalCloud() && (
               <OrgPermissionCan I={OrgPermissionActions.Edit} a={OrgPermissionSubjects.Billing}>
                 {(isAllowed) => (
                   <button
diff --git a/frontend/src/pages/organization/BillingPage/components/BillingTabGroup/BillingTabGroup.tsx b/frontend/src/pages/organization/BillingPage/components/BillingTabGroup/BillingTabGroup.tsx
index a7fb41afe..9631f68da 100644
--- a/frontend/src/pages/organization/BillingPage/components/BillingTabGroup/BillingTabGroup.tsx
+++ b/frontend/src/pages/organization/BillingPage/components/BillingTabGroup/BillingTabGroup.tsx
@@ -1,5 +1,6 @@
 import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
+import { isInfisicalCloud } from "@app/helpers/platform";
 import { withPermission } from "@app/hoc";
 
 import { BillingCloudTab } from "../BillingCloudTab";
@@ -16,12 +17,7 @@ const tabs = [
 
 export const BillingTabGroup = withPermission(
   () => {
-    const isCloudInstance =
-      window.location.origin.includes("https://app.infisical.com") ||
-      window.location.origin.includes("https://eu.infisical.com") ||
-      window.location.origin.includes("https://gamma.infisical.com");
-
-    const tabsFiltered = isCloudInstance
+    const tabsFiltered = isInfisicalCloud()
       ? tabs
       : [{ name: "Infisical Self-Hosted", key: "tab-infisical-cloud" }];
 
@@ -35,7 +31,7 @@ export const BillingTabGroup = withPermission(
         <TabPanel value={tabs[0].key}>
           <BillingCloudTab />
         </TabPanel>
-        {isCloudInstance && (
+        {isInfisicalCloud() && (
           <>
             <TabPanel value={tabs[1].key}>
               <BillingSelfHostedTab />