diff --git a/PadelClubData/Data/DataStore.swift b/PadelClubData/Data/DataStore.swift
index eeeb763..e315e0b 100644
--- a/PadelClubData/Data/DataStore.swift
+++ b/PadelClubData/Data/DataStore.swift
@@ -332,7 +332,7 @@ public class DataStore: ObservableObject {
         _lastRunningAndNextCheckDate = nil
     }
     
-    public func runningAndNextMatches() -> [Match] {
+    public func runningAndNextMatches(_ selectedTournaments: Set<String> = Set()) -> [Match] {
         let dateNow : Date = Date()
         if let lastCheck = _lastRunningAndNextCheckDate,
            let cachedMatches = _cachedRunningAndNextMatches,
@@ -340,7 +340,7 @@ public class DataStore: ObservableObject {
             return cachedMatches
         }
 
-        let lastTournaments = self.tournaments.filter { $0.isDeleted == false && $0.startDate <= dateNow && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10)
+        let lastTournaments = self.tournaments.filter { (selectedTournaments.isEmpty || selectedTournaments.contains($0.id)) && $0.isDeleted == false && ($0.startDate <= dateNow || $0.startDate >= dateNow.addingTimeInterval(86_400)) && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10)
         
         var runningMatches: [Match] = []
         for tournament in lastTournaments {