diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index ad50f23..ee956bd 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -1908,7 +1908,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -1949,7 +1949,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
diff --git a/PadelClub/Data/MatchScheduler.swift b/PadelClub/Data/MatchScheduler.swift
index 4ea4dfd..9bda2a8 100644
--- a/PadelClub/Data/MatchScheduler.swift
+++ b/PadelClub/Data/MatchScheduler.swift
@@ -677,7 +677,10 @@ class MatchScheduler : ModelObject, Storable {
     }
     
     func updateSchedule(tournament: Tournament) -> Bool {
-        let lastDate = updateGroupStageSchedule(tournament: tournament)
+        var lastDate = tournament.startDate
+        if tournament.groupStageCount > 0 {
+            lastDate = updateGroupStageSchedule(tournament: tournament)
+        }
         return updateBracketSchedule(tournament: tournament, fromRoundId: nil, fromMatchId: nil, startDate: lastDate)
     }
 }
diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 2ae020f..d2fac20 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1762,7 +1762,7 @@ class Tournament : ModelObject, Storable {
     }
     
     func getGroupStageChunkValue() -> Int {
-        if teamsPerGroupStage >= 2 {
+        if groupStageCount > 0 && teamsPerGroupStage >= 2 {
             let result = courtCount / (teamsPerGroupStage / 2)
             let remainder = courtCount % (teamsPerGroupStage / 2)
             let value = remainder == 0 ? result : result + 1