diff --git a/apps/api/internal/bat/engine.go b/apps/api/internal/bat/engine.go
index 5c236b12..b997d0a0 100644
--- a/apps/api/internal/bat/engine.go
+++ b/apps/api/internal/bat/engine.go
@@ -141,24 +141,13 @@ func (b *BatEngine) GroupCandidates(admissionsData []AdmissionCandidate) ([]Team
 
 	// Sort admissions candidates on a valid TeamID
 	for _, app := range admissionsData {
-		if app.TeamID.Valid {
+		if app.TeamID.Valid && len(teamMap[app.TeamID.UUID]) > 1 {
 			teamMap[app.TeamID.UUID] = append(teamMap[app.TeamID.UUID], app)
 		} else {
 			individualCandidates = append(individualCandidates, app)
 		}
 	}
 
-	// Comb out all 1 person teams
-	filtered := make(map[uuid.UUID][]AdmissionCandidate)
-	for key, team := range teamMap {
-		if len(team) > 1 {
-			filtered[key] = team
-		} else {
-			individualCandidates = append(individualCandidates, filtered[key]...)
-		}
-	}
-	teamMap = filtered
-
 	teamsEvalData := make([]TeamEvaluationData, 0)
 	for teamId, members := range teamMap {
 		var totalScore float64