diff --git a/src/client/Api.ts b/src/client/Api.ts
index d128ad2f2..7a18dea8a 100644
--- a/src/client/Api.ts
+++ b/src/client/Api.ts
@@ -235,13 +235,6 @@ export async function fetchPlayerLeaderboard(
     });
 
     if (!res.ok) {
-      // Handle "Page must be between X and Y" error as end of list
-      if (res.status === 400) {
-        const errorJson = await res.json().catch(() => null);
-        if (errorJson?.message?.includes("Page must be between")) {
-          return "reached_limit";
-        }
-      }
       console.warn(
         "fetchPlayerLeaderboard: unexpected status",
         res.status,
@@ -253,6 +246,10 @@ export async function fetchPlayerLeaderboard(
     const json = await res.json();
     const parsed = RankedLeaderboardResponseSchema.safeParse(json);
     if (!parsed.success) {
+      // Handle "Page must be between X and Y" error as end of list
+      if (json?.message?.includes?.("Page must be between")) {
+        return "reached_limit";
+      }
       console.warn(
         "fetchPlayerLeaderboard: Zod validation failed",
         parsed.error.toString(),