diff --git a/PadelClubData/Data/Tournament.swift b/PadelClubData/Data/Tournament.swift
index ad2446c..d1ea740 100644
--- a/PadelClubData/Data/Tournament.swift
+++ b/PadelClubData/Data/Tournament.swift
@@ -1472,7 +1472,7 @@ defer {
 
         var _groupStages = [GroupStage]()
         for index in 0..<groupStageCount {
-            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageFormat)
+            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageSmartMatchFormat())
             _groupStages.append(groupStage)
         }
 
@@ -1720,7 +1720,6 @@ defer {
 
     public func groupStageSmartMatchFormat() -> MatchFormat {
         let format = tournamentLevel.federalFormatForGroupStage()
-        if tournamentLevel == .p25 { return .superTie }
         if format.rank < groupStageMatchFormat.rank {
             return format
         } else {
@@ -1858,7 +1857,6 @@ defer {
 
     public func roundSmartMatchFormat(_ roundIndex: Int) -> MatchFormat {
         let format = tournamentLevel.federalFormatForBracketRound(roundIndex)
-        if tournamentLevel == .p25 { return .superTie }
         if format.rank < matchFormat.rank {
             return format
         } else {