diff --git a/PadelClub/ViewModel/FederalDataViewModel.swift b/PadelClub/ViewModel/FederalDataViewModel.swift
index 2ca3b2f..c841fb7 100644
--- a/PadelClub/ViewModel/FederalDataViewModel.swift
+++ b/PadelClub/ViewModel/FederalDataViewModel.swift
@@ -90,7 +90,7 @@ class FederalDataViewModel {
             &&
             (ageCategories.isEmpty || tournament.tournaments.anySatisfy({ ageCategories.contains($0.age) }))
             &&
-            (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+            (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
             &&
             (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
             &&
@@ -100,7 +100,7 @@ class FederalDataViewModel {
     
     func countForTournamentBuilds(from tournaments: [any FederalTournamentHolder]) -> Int {
         tournaments.filter({ tournament in
-            (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+            (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
             &&
             (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
             &&
@@ -151,7 +151,7 @@ class FederalDataViewModel {
         &&
         (ageCategories.isEmpty || ageCategories.contains(build.age))
         &&
-        (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+        (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
         &&
         (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
         &&