diff --git a/prisma/queries/getBuildsByWeapon.ts b/prisma/queries/getBuildsByWeapon.ts
index 172d45a38..ef89d1068 100644
--- a/prisma/queries/getBuildsByWeapon.ts
+++ b/prisma/queries/getBuildsByWeapon.ts
@@ -10,8 +10,15 @@ type BuildsByWeapon = Prisma.PromiseReturnType<typeof getBuildsByWeaponQuery>;
 const getBuildsByWeaponQuery = async (weapon: string) =>
   prisma.build.findMany({
     where: { weapon },
-    orderBy: [{ top500: "desc" }, { jpn: "desc" }, { updatedAt: "desc" }],
-    include: { user: true },
+    orderBy: [
+      { top500: "desc" },
+      { jpn: "desc" },
+      { user: { plusStatus: { membershipTier: "asc" } } },
+      { updatedAt: "desc" },
+    ],
+    include: {
+      user: { include: { plusStatus: { select: { membershipTier: true } } } },
+    },
   });
 
 export const getBuildsByWeapon = async (weapon: string) =>
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index dbbb7f072..7baba22da 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -6,6 +6,7 @@ datasource db {
 
 generator client {
   provider = "prisma-client-js"
+  previewFeatures = ["orderByRelation"]
 }
 
 model User {