diff --git a/PadelClubData/Data/Match.swift b/PadelClubData/Data/Match.swift
index 8deb733..60aa3eb 100644
--- a/PadelClubData/Data/Match.swift
+++ b/PadelClubData/Data/Match.swift
@@ -875,7 +875,7 @@ defer {
         let endedSetsTwo = teamScoreOtherTeam.score?.components(separatedBy: ",").compactMap({ $0.components(separatedBy: "-").first }).compactMap({ Int($0) }) ?? matchFormat.defaultWalkOutScore(teamScoreOtherTeam.isWalkOut())
         var setDifference : Int = 0
         let zip = zip(endedSetsOne, endedSetsTwo)
-        if matchFormat.setsToWin == 1 {
+        if matchFormat.setsToWin == 1, endedSetsOne.count > 0, endedSetsTwo.count > 0 {
             setDifference = endedSetsOne[0] - endedSetsTwo[0]
         } else {
             setDifference = zip.filter { $0 > $1 }.count - zip.filter { $1 > $0 }.count