diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx
index bbb34b0d2..48c20bc6e 100644
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx
+++ b/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx
@@ -63,6 +63,7 @@ function getInitialState({ user, lang }: { user?: User; lang: Lang }) {
     }
   }
   if (!membership.membershipLevel) return null
+  // @ts-expect-error: membership levels needs proper fix
   const level = membershipLevels[membership.membershipLevel]
 
   switch (level) {
@@ -155,6 +156,7 @@ export default function OverviewTable({
 
   let activeMembershipLevel: membershipLevels | null = null
   if (activeMembership?.membershipLevel) {
+    // @ts-expect-error: membershiplevel needs proper fix
     activeMembershipLevel = membershipLevels[activeMembership?.membershipLevel]
   }
 
diff --git a/components/MyPages/Blocks/Overview/Friend/index.tsx b/components/MyPages/Blocks/Overview/Friend/index.tsx
index c1b89c3e6..304eade1f 100644
--- a/components/MyPages/Blocks/Overview/Friend/index.tsx
+++ b/components/MyPages/Blocks/Overview/Friend/index.tsx
@@ -22,6 +22,7 @@ export default async function Friend({
   if (!membership?.membershipLevel) {
     return null
   }
+  // @ts-expect-error: membershiplevel needs proper fix
   const isHighestLevel = isHighestMembership(membership.membershipLevel)
 
   return (
@@ -31,11 +32,13 @@ export default async function Friend({
           {formatMessage(
             isHighestLevel
               ? { id: "Highest level" }
-              : { id: `Level ${membershipLevels[membership.membershipLevel]}` }
+              : // @ts-expect-error: membershiplevel needs proper fix
+                { id: `Level ${membershipLevels[membership.membershipLevel]}` }
           )}
         </Body>
         {membership ? (
           <MembershipLevel
+            // @ts-expect-error: membershiplevel needs proper fix
             level={membershipLevels[membership.membershipLevel]}
           />
         ) : null}
diff --git a/server/routers/user/output.ts b/server/routers/user/output.ts
index a6bd88611..1ac09f2f9 100644
--- a/server/routers/user/output.ts
+++ b/server/routers/user/output.ts
@@ -1,7 +1,5 @@
 import { z } from "zod"
 
-import { MembershipLevelEnum } from "@/constants/membershipLevels"
-
 import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries"
 
 export const getUserSchema = z.object({
@@ -22,7 +20,7 @@ export const getUserSchema = z.object({
       currentPoints: z.number(),
       expirationDate: z.string(),
       membershipNumber: z.string(),
-      membershipLevel: z.nativeEnum(MembershipLevelEnum).optional(),
+      membershipLevel: z.string().optional(),
       memberSince: z.string(),
       membershipType: z.string(),
       nextLevel: z.string().optional(),
diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts
index b983e8439..d2532112b 100644
--- a/server/routers/user/query.ts
+++ b/server/routers/user/query.ts
@@ -33,6 +33,7 @@ import type {
   LoginType,
   TrackingSDKUserData,
 } from "@/types/components/tracking"
+import type { MembershipLevel } from "@/constants/membershipLevels"
 
 // OpenTelemetry metrics: User
 const meter = metrics.getMeter("trpc.user")
@@ -437,7 +438,7 @@ export const userQueryRouter = router({
       loginStatus: "logged in",
       loginType: ctx.session.token.loginType as LoginType,
       memberId: membership?.membershipNumber,
-      memberLevel: membership?.membershipLevel,
+      memberLevel: membership?.membershipLevel as MembershipLevel,
       noOfNightsStayed: verifiedPreviousStaysData.data.links?.totalCount ?? 0,
       totalPointsAvailableToSpend: membership?.currentPoints,
       loginAction: "login success",