diff --git a/PadelClub/Data/MatchScheduler.swift b/PadelClub/Data/MatchScheduler.swift
index 9fb3349..4ea4dfd 100644
--- a/PadelClub/Data/MatchScheduler.swift
+++ b/PadelClub/Data/MatchScheduler.swift
@@ -85,7 +85,7 @@ class MatchScheduler : ModelObject, Storable {
     
     @discardableResult
     func updateGroupStageSchedule(tournament: Tournament) -> Date {
-        let computedGroupStageChunkCount = groupStageChunkCount ?? 1
+        let computedGroupStageChunkCount = groupStageChunkCount ?? tournament.getGroupStageChunkValue()
         let groupStages: [GroupStage] = tournament.groupStages()
         let numberOfCourtsAvailablePerRotation: Int = tournament.courtCount