diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 32dd89f..35c94eb 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1151,7 +1151,7 @@ defer {
         return allMatches.filter({ $0.isReady() && $0.isRunning() == false && $0.hasEnded() == false }).sorted(by: \.computedStartDateForSorting)
     }
 
-    func finishedMatches(_ allMatches: [Match], limit: Int? = nil) -> [Match] {
+    func finishedMatches(_ allMatches: [Match], limit: Int?) -> [Match] {
         #if _DEBUG_TIME //DEBUGING TIME
         let start = Date()
         defer {
@@ -1159,8 +1159,11 @@ defer {
             print("func tournament finishedMatches", id, duration.formatted(.units(allowed: [.seconds, .milliseconds])))
         }
         #endif
-        let _limit = limit ?? courtCount
-        return Array(allMatches.filter({ $0.hasEnded() }).sorted(by: \.computedEndDateForSorting).reversed().prefix(_limit))
+        if let limit {
+            return Array(allMatches.filter({ $0.hasEnded() }).sorted(by: \.computedEndDateForSorting).reversed().prefix(limit))
+        } else {
+            return Array(allMatches.filter({ $0.hasEnded() }).sorted(by: \.computedEndDateForSorting).reversed())
+        }
     }
     
     func teamsRanked() -> [TeamRegistration] {
diff --git a/PadelClub/Views/GroupStage/GroupStagesView.swift b/PadelClub/Views/GroupStage/GroupStagesView.swift
index 0e148a5..7274171 100644
--- a/PadelClub/Views/GroupStage/GroupStagesView.swift
+++ b/PadelClub/Views/GroupStage/GroupStagesView.swift
@@ -109,7 +109,7 @@ struct GroupStagesView: View {
             GenericDestinationPickerView(selectedDestination: $selectedDestination, destinations: allDestinations(), nilDestinationIsValid: true)
             switch selectedDestination {
             case .all:
-                let finishedMatches = tournament.finishedMatches(allMatches)
+                let finishedMatches = tournament.finishedMatches(allMatches, limit: nil)
 
                 List {
                     if tournament.groupStageAdditionalQualified > 0 {
diff --git a/PadelClub/Views/Round/RoundView.swift b/PadelClub/Views/Round/RoundView.swift
index 3e52112..12bda95 100644
--- a/PadelClub/Views/Round/RoundView.swift
+++ b/PadelClub/Views/Round/RoundView.swift
@@ -74,15 +74,17 @@ struct RoundView: View {
                 let bracketTip = BracketEditTip(nextRoundName: upperRound.round.nextRound()?.roundTitle())
                 TipView(bracketTip).tipStyle(tint: .green, asSection: true)
                 
-                Section {
-                    let leftToPlay = (RoundRule.numberOfMatches(forRoundIndex: upperRound.round.index) - disabledMatchesCount)
-                    LabeledContent {
-                        Text(leftToPlay.formatted())
-                    } label: {
-                        Text("Match\(leftToPlay.pluralSuffix) à jouer \(upperRound.title)")
+                if upperRound.round.hasStarted() == false {
+                    Section {
+                        let leftToPlay = (RoundRule.numberOfMatches(forRoundIndex: upperRound.round.index) - disabledMatchesCount)
+                        LabeledContent {
+                            Text(leftToPlay.formatted())
+                        } label: {
+                            Text("Match\(leftToPlay.pluralSuffix) à jouer \(upperRound.title)")
+                        }
+                    } footer: {
+                        Text("\(disabledMatchesCount) match\(disabledMatchesCount.pluralSuffix) désactivé\(disabledMatchesCount.pluralSuffix) automatiquement")
                     }
-                } footer: {
-                    Text("\(disabledMatchesCount) match\(disabledMatchesCount.pluralSuffix) désactivé\(disabledMatchesCount.pluralSuffix) automatiquement")
                 }
             }
             
diff --git a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
index e491aec..baf9600 100644
--- a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
+++ b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
@@ -106,6 +106,7 @@ struct TournamentRankView: View {
                 }
             }
         }
+        .id(calculating)
         .alert("Position", isPresented: isEditingTeam) {
             if let selectedTeam {
                 @Bindable var team = selectedTeam
@@ -154,6 +155,7 @@ struct TournamentRankView: View {
     }
     
     struct TeamRankCellView: View {
+        @EnvironmentObject var dataStore: DataStore
         @Environment(\.editMode) private var editMode
         @Environment(Tournament.self) var tournament: Tournament
         @State private var isEditingTeam: Bool = false
@@ -306,6 +308,7 @@ struct TournamentRankView: View {
             calculating = true
         }
 
+        self.rankings.removeAll()
         let finalRanks = await tournament.finalRanking()
         finalRanks.keys.sorted().forEach { rank in
             if let rankedTeamIds = finalRanks[rank] {
diff --git a/PadelClub/Views/Tournament/TournamentRunningView.swift b/PadelClub/Views/Tournament/TournamentRunningView.swift
index 4763306..626a82e 100644
--- a/PadelClub/Views/Tournament/TournamentRunningView.swift
+++ b/PadelClub/Views/Tournament/TournamentRunningView.swift
@@ -21,7 +21,8 @@ struct TournamentRunningView: View {
         MatchListView(section: "en cours", matches: tournament.runningMatches(allMatches), hideWhenEmpty: tournament.hasEnded())
 //        MatchListView(section: "à lancer", matches: tournament.readyMatches(allMatches), isExpanded: false)
 //        MatchListView(section: "disponible", matches: tournament.availableToStart(allMatches), isExpanded: false)
-        MatchListView(section: "terminés", matches: tournament.finishedMatches(allMatches), isExpanded: tournament.hasEnded())
+        let finishedMatches = tournament.finishedMatches(allMatches, limit: tournament.courtCount)
+        MatchListView(section: "Dernier\(finishedMatches.count.pluralSuffix) match\(finishedMatches.count.pluralSuffix) terminé\(finishedMatches.count.pluralSuffix)", matches: finishedMatches, isExpanded: tournament.hasEnded())
     }
 }