diff --git a/apps/client/src/ee/licence/components/license-details.tsx b/apps/client/src/ee/licence/components/license-details.tsx
index 0a805de91..966db8499 100644
--- a/apps/client/src/ee/licence/components/license-details.tsx
+++ b/apps/client/src/ee/licence/components/license-details.tsx
@@ -34,6 +34,7 @@ export default function LicenseDetails() {
             <Table.Td>
               {license.licenseType === "business" ? "Business" : "Enterprise"}{" "}
               {license.trial && <Badge color="green">Trial</Badge>}
+              {license.lifetime && <Badge color="blue">Lifetime</Badge>}
             </Table.Td>
           </Table.Tr>
 
@@ -59,7 +60,14 @@ export default function LicenseDetails() {
           <Table.Tr>
             <Table.Th>Expires at</Table.Th>
             <Table.Td>
-              {formatLocalized(license.expiresAt, "dd MMMM, yyyy", "PPP", locale)}
+              {license.lifetime
+                ? "Never"
+                : formatLocalized(
+                    license.expiresAt,
+                    "dd MMMM, yyyy",
+                    "PPP",
+                    locale,
+                  )}
             </Table.Td>
           </Table.Tr>
           <Table.Tr>
diff --git a/apps/client/src/ee/licence/license.utils.ts b/apps/client/src/ee/licence/license.utils.ts
index 022c6b1d4..c0908515d 100644
--- a/apps/client/src/ee/licence/license.utils.ts
+++ b/apps/client/src/ee/licence/license.utils.ts
@@ -4,10 +4,12 @@ import { differenceInDays, isAfter } from "date-fns";
 export const GRACE_PERIOD_DAYS = 10;
 
 export function isLicenseExpired(license: ILicenseInfo): boolean {
+  if (license.lifetime) return false;
   return isAfter(new Date(), license.expiresAt);
 }
 
 export function daysToExpire(license: ILicenseInfo): number {
+  if (license.lifetime) return Infinity;
   const days = differenceInDays(license.expiresAt, new Date());
   return days > 0 ? days : 0;
 }
diff --git a/apps/client/src/ee/licence/types/license.types.ts b/apps/client/src/ee/licence/types/license.types.ts
index ec3c9a189..16cb7e138 100644
--- a/apps/client/src/ee/licence/types/license.types.ts
+++ b/apps/client/src/ee/licence/types/license.types.ts
@@ -6,6 +6,7 @@ export interface ILicenseInfo {
   seatCount: number;
   licenseType: LicenseType;
   issuedAt: Date;
-  expiresAt: Date;
+  expiresAt: Date | null;
   trial: boolean;
+  lifetime: boolean;
 }
\ No newline at end of file
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 844f2003c..f6344cbb1 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 844f2003cdc36268478fdfb5ad64b656df6b633b
+Subproject commit f6344cbb12cec762691aaf18b9e7f2a242b29d1a