diff --git a/packages/core/src/code_assist/setup.ts b/packages/core/src/code_assist/setup.ts
index 6ff61523..6771bbcc 100644
--- a/packages/core/src/code_assist/setup.ts
+++ b/packages/core/src/code_assist/setup.ts
@@ -35,8 +35,11 @@ export async function setupUser(
     metadata: clientMetadata,
   });
 
+  const onboardTier: string =
+    loadRes.allowedTiers?.find((tier) => tier.isDefault)?.id ?? 'legacy-tier';
+
   const onboardReq: OnboardUserRequest = {
-    tierId: 'legacy-tier',
+    tierId: onboardTier,
     cloudaicompanionProject: loadRes.cloudaicompanionProject || '',
     metadata: clientMetadata,
   };