diff --git a/packages/website-ue/src/api/server.ts b/packages/website-ue/src/api/server.ts
index 82c5bbd90..5ad295b40 100644
--- a/packages/website-ue/src/api/server.ts
+++ b/packages/website-ue/src/api/server.ts
@@ -383,14 +383,13 @@ export class ServerAPI extends AbstractAPI {
   @Cache()
   async avatar(id: string) {
     const avatar = this.metadata.item(id);
-    const name = avatar.name;
     const stuff_ui = avatar.StuffUI("UIComponent");
     const profile_avatar = avatar.ProfileAvatar();
     const sellable = avatar.components.sellableComponent
       ? avatar.Sellable()
       : undefined;
 
-    return { name, stuff_ui, profile_avatar, sellable };
+    return { id, stuff_ui, profile_avatar, sellable };
   }
 
   @Cache()
diff --git a/packages/website-ue/src/astro/isChunkEnabled.ts b/packages/website-ue/src/astro/isChunkEnabled.ts
index ba409b3ce..b51eeee70 100644
--- a/packages/website-ue/src/astro/isChunkEnabled.ts
+++ b/packages/website-ue/src/astro/isChunkEnabled.ts
@@ -2,5 +2,5 @@ import { assertSecret } from "@blitzkit/core";
 
 export function isChunkEnabled(chunk: string) {
   const buildChunk = assertSecret(import.meta.env.BUILD_CHUNK);
-  return [chunk, "*"].includes(buildChunk);
+  return buildChunk === "*" || chunk === buildChunk;
 }
diff --git a/packages/website-ue/src/pages/[api]/avatars/[id].json.ts b/packages/website-ue/src/pages/[api]/avatars/[id].json.ts
index 034f5854e..1a2f06db1 100644
--- a/packages/website-ue/src/pages/[api]/avatars/[id].json.ts
+++ b/packages/website-ue/src/pages/[api]/avatars/[id].json.ts
@@ -5,10 +5,7 @@ import { getStaticPaths as _getStaticPaths } from "../_index";
 
 export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
   const { avatars } = await api.avatars();
-
-  return avatars.map((avatar) => ({
-    params: { id: avatar.name },
-  }));
+  return avatars.map(({ id }) => ({ params: { id } }));
 });
 
 /**