diff --git a/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs b/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs
index f4464e198..af1708523 100644
--- a/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs
+++ b/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs
@@ -49,7 +49,8 @@ IStore store
             .Include(p => p.Challenges.Where(c => c.PlayerMode == PlayerMode.Competition))
             .Include(p => p.User)
             .Include(p => p.Sponsor)
-            .Where(p => p.Challenges.Any(c => c.PlayerMode == PlayerMode.Competition));
+            .Where(p => p.Challenges.Any(c => c.PlayerMode == PlayerMode.Competition))
+            .Where(p => p.TeamId != null && p.TeamId != string.Empty);
 
         if (enrollDateStart != null)
             query = query
@@ -125,7 +126,6 @@ public async Task<EnrollmentReportRawResults> GetRawResults(EnrollmentReportPara
                     MaxPossiblePoints = c.Points
                 })
             })
-            .Where(p => p.TeamId is not null && p.TeamId != string.Empty)
             .GroupBy(p => p.TeamId)
             .ToDictionary(g => g.Key, g => g.ToList());