diff --git a/PadelClub/Views/Score/FollowUpMatchView.swift b/PadelClub/Views/Score/FollowUpMatchView.swift
index 9fd6867..0ee7f20 100644
--- a/PadelClub/Views/Score/FollowUpMatchView.swift
+++ b/PadelClub/Views/Score/FollowUpMatchView.swift
@@ -286,8 +286,10 @@ struct FollowUpMatchView: View {
                 }
             }
             .onChange(of: readyMatches) {
+                dismissWhenPresentFollowUpMatchIsDismissed = true
                 if autoDismiss {
-                    dismissWhenPresentFollowUpMatchIsDismissed = true
+                    dismiss()
+                } else if readyMatches.isEmpty && matchesLeft.isEmpty {
                     dismiss()
                 }
             }