diff --git a/TournamentAssistantUI/UI/MatchPage.xaml.cs b/TournamentAssistantUI/UI/MatchPage.xaml.cs
index 68cdbf4e..27dcec04 100644
--- a/TournamentAssistantUI/UI/MatchPage.xaml.cs
+++ b/TournamentAssistantUI/UI/MatchPage.xaml.cs
@@ -276,8 +276,7 @@ await Dispatcher.InvokeAsync(() =>
 
         private void UpdateTeamsGrid(Match match)
         {
-            var playersInMatch = match.AssociatedUsers.Where(x => MainPage.Client.GetUserByGuid(x)?.ClientType == User.ClientTypes.Player).Select(MainPage.Client.GetUserByGuid);
-            var teamsInMatch = playersInMatch.Select(x => x.Team?.Id).Where(x => x != null).Distinct().Select(MainPage.Client.GetTeamByGuid);
+            var teamsInMatch = GetPlayersInMatch().Select(x => x.Team?.Id).Where(x => x != null).Distinct().Select(MainPage.Client.GetTeamByGuid);
 
             Dispatcher.Invoke(() =>
             {
@@ -574,8 +573,7 @@ private async Task<bool> SetUpAndPlaySong(bool useSync = false)
         {
             if (useSync)
             {
-                var playersInMatch = Match.AssociatedUsers.Where(x => MainPage.Client.GetUserByGuid(x).ClientType == User.ClientTypes.Player).Select(MainPage.Client.GetUserByGuid);
-                var teamsInMatch = playersInMatch.Select(x => x.Team?.Id).Where(x => x != null).Distinct().Select(MainPage.Client.GetTeamByGuid);
+                var teamsInMatch = GetPlayersInMatch().Select(x => x.Team?.Id).Where(x => x != null).Distinct().Select(MainPage.Client.GetTeamByGuid);
 
                 _checkedTeams = teamsInMatch.Where(x => TeamNameIsCheckedInGrid(x.Name)).ToList();
             }