diff --git a/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift b/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
index 8b4dfaa..2e2b15b 100644
--- a/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
+++ b/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
@@ -52,6 +52,11 @@ struct TournamentStatusView: View {
                             if let event, isLastTournament {
                                 try dataStore.events.delete(instance: event)
                             }
+                            if eventDismiss == false || isLastTournament {
+                                navigation.path = NavigationPath()
+                            } else {
+                                dismiss()
+                            }
                         } catch {
                             Logger.error(error)
                         }
@@ -61,14 +66,15 @@ struct TournamentStatusView: View {
                         tournament.navigationPath.removeAll()
                         do {
                             try dataStore.tournaments.addOrUpdate(instance: tournament)
+                            if eventDismiss == false {
+                                navigation.path = NavigationPath()
+                            } else {
+                                dismiss()
+                            }
                         } catch {
                             Logger.error(error)
                         }
                     }
-                    
-                    if eventDismiss {
-                        navigation.path = NavigationPath()
-                    }
                 }
             }