diff --git a/src/server/routers/analytics.ts b/src/server/routers/analytics.ts
index a901500..951573e 100644
--- a/src/server/routers/analytics.ts
+++ b/src/server/routers/analytics.ts
@@ -198,6 +198,7 @@ export const analyticsRouter = router({
           teamName: true,
           status: true,
           assignments: {
+            where: assignmentWhere(input),
             select: {
               evaluation: {
                 select: { criterionScoresJson: true, status: true },
@@ -1072,6 +1073,7 @@ export const analyticsRouter = router({
             logoKey: true,
             logoProvider: true,
             assignments: {
+              where: input.roundId ? { roundId: input.roundId } : undefined,
               select: {
                 roundId: true,
                 round: { select: { id: true, name: true, sortOrder: true } },