diff --git a/PadelClub/Data/Match.swift b/PadelClub/Data/Match.swift
index ab9af2f..1b27671 100644
--- a/PadelClub/Data/Match.swift
+++ b/PadelClub/Data/Match.swift
@@ -290,11 +290,11 @@ defer {
                 forwardMatch.byeState = false
                 forwardMatch._toggleMatchDisableState(false, forward: true)
             }
-        } else {
-            if forwardMatch.byeState == false || forwardMatch.disabled != state {
-                forwardMatch.byeState = true
-                forwardMatch._toggleMatchDisableState(state, forward: true)
-            }
+        } else if forwardMatch.byeState == false {
+            forwardMatch.byeState = true
+            forwardMatch._toggleMatchDisableState(false, forward: true)
+        } else if forwardMatch.disabled != state {
+            forwardMatch._toggleMatchDisableState(state, forward: true)
         }
         
 //        if next.disabled == false {
@@ -368,7 +368,7 @@ defer {
         if single == false {
             _toggleLoserMatchDisableState(state)
             if forward {
-                //_toggleForwardMatchDisableState(state)
+                _toggleForwardMatchDisableState(state)
             } else {
                 topPreviousRoundMatch()?._toggleMatchDisableState(state)
                 bottomPreviousRoundMatch()?._toggleMatchDisableState(state)