diff --git a/PadelClub/Data/GroupStage.swift b/PadelClub/Data/GroupStage.swift
index 7b21f1b..da476cb 100644
--- a/PadelClub/Data/GroupStage.swift
+++ b/PadelClub/Data/GroupStage.swift
@@ -146,6 +146,7 @@ final class GroupStage: ModelObject, Storable {
     func buildMatches(keepExistingMatches: Bool = false) {
         var teamScores = [TeamScore]()
         var matches = [Match]()
+        clearScoreCache()
         
         if keepExistingMatches == false {
             _removeMatches()
diff --git a/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift b/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
index 7bf706d..5bfa715 100644
--- a/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
+++ b/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
@@ -143,7 +143,11 @@ struct GroupStageSettingsView: View {
             
             Section {
                 RowButtonView("Recommencer tous les matchs", role: .destructive) {
+                    let isReturnMatchesEnabled = groupStage.isReturnMatchEnabled()
                     groupStage.buildMatches()
+                    if isReturnMatchesEnabled {
+                        groupStage.addReturnMatches()
+                    }
                 }
             } footer: {
                 Text("Tous les matchs seront recronstruits, les données des matchs seront perdus.")