diff --git a/app/features/api-public/routes/tournament.$id.teams.ts b/app/features/api-public/routes/tournament.$id.teams.ts
index 8c8ec030d..8c5973d8e 100644
--- a/app/features/api-public/routes/tournament.$id.teams.ts
+++ b/app/features/api-public/routes/tournament.$id.teams.ts
@@ -31,7 +31,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
           "=",
           "TournamentTeamCheckIn.tournamentTeamId",
         )
-        .on("TournamentTeamCheckIn.checkedInAt", "is", null),
+        .on("TournamentTeamCheckIn.bracketIdx", "is", null),
     )
     .select(({ eb }) => [
       "TournamentTeam.id",
diff --git a/app/features/api-public/routes/tournament.$id.ts b/app/features/api-public/routes/tournament.$id.ts
index 40f02983d..5ada194ec 100644
--- a/app/features/api-public/routes/tournament.$id.ts
+++ b/app/features/api-public/routes/tournament.$id.ts
@@ -34,10 +34,14 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
         jsonArrayFrom(
           eb
             .selectFrom("TournamentTeam")
-            .leftJoin(
-              "TournamentTeamCheckIn",
-              "TournamentTeam.id",
-              "TournamentTeamCheckIn.tournamentTeamId",
+            .leftJoin("TournamentTeamCheckIn", (join) =>
+              join
+                .onRef(
+                  "TournamentTeam.id",
+                  "=",
+                  "TournamentTeamCheckIn.tournamentTeamId",
+                )
+                .on("TournamentTeamCheckIn.bracketIdx", "is", null),
             )
             .select(["TournamentTeamCheckIn.checkedInAt"])
             .where("TournamentTeam.tournamentId", "=", id),