diff --git a/PadelClub/Data/GroupStage.swift b/PadelClub/Data/GroupStage.swift
index b7bd594..7b21f1b 100644
--- a/PadelClub/Data/GroupStage.swift
+++ b/PadelClub/Data/GroupStage.swift
@@ -255,7 +255,7 @@ final class GroupStage: ModelObject, Storable {
                 matchIndexes.append(index)
             }
         }
-        return _matches().filter { matchIndexes.contains($0.index) }
+        return _matches().filter { matchIndexes.contains($0.index%matchCount) }
     }
     
     func initialStartDate(forTeam team: TeamRegistration) -> Date? {