diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index a4726bc..32dd89f 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -2010,7 +2010,7 @@ defer {
     }
     
     func groupStageLoserBracketsInitialPlace() -> Int {
-        selectedSortedTeams().filter({ $0.qualified || $0.bracketPosition != nil }).count + 1
+        return teamCount - teamsPerGroupStage * groupStageCount + qualifiedPerGroupStage * groupStageCount + groupStageAdditionalQualified + 1
     }
     
     // MARK: -
diff --git a/PadelClub/Views/GroupStage/GroupStageView.swift b/PadelClub/Views/GroupStage/GroupStageView.swift
index 62c58c6..5b04f71 100644
--- a/PadelClub/Views/GroupStage/GroupStageView.swift
+++ b/PadelClub/Views/GroupStage/GroupStageView.swift
@@ -197,7 +197,7 @@ struct GroupStageView: View {
                         }
                     }
                     .listRowView(isActive: team.qualified, color: .master)
-                    .listRowView(isActive: team.isHere(), color: .green, hideColorVariation: true)
+                    .listRowView(isActive: team.isHere() && groupStage.hasEnded() == false, color: .green, hideColorVariation: true)
                 } else {
                     VStack(alignment: .leading, spacing: 0) {
                         Text("#\(index + 1)")