diff --git a/app/db/models/builds/buildsByWeaponId.sql b/app/db/models/builds/buildsByWeaponId.sql
index f45408984..6c721e48a 100644
--- a/app/db/models/builds/buildsByWeaponId.sql
+++ b/app/db/models/builds/buildsByWeaponId.sql
@@ -51,5 +51,8 @@ from
 group by
   "BuildWithWeapon"."id"
 order by
-  "PlusTier"."tier" asc,
+  case
+    when "PlusTier"."tier" is null then 4
+    else "PlusTier"."tier"
+  end asc,
   "BuildWithWeapon"."updatedAt" desc