diff --git a/src/EvoSC.Common/Database/Repository/Permissions/PermissionRepository.cs b/src/EvoSC.Common/Database/Repository/Permissions/PermissionRepository.cs
index 243f0087c..6d68f664c 100644
--- a/src/EvoSC.Common/Database/Repository/Permissions/PermissionRepository.cs
+++ b/src/EvoSC.Common/Database/Repository/Permissions/PermissionRepository.cs
@@ -102,7 +102,8 @@ public Task RemovePlayerFromGroupAsync(long playerId, int groupId) => Table<DbUs
 
     public async Task SetDisplayGroupAsync(long playerId, int groupId)
     {
-        var userGroup = await Table<DbUserGroup>().FirstOrDefaultAsync(ug => ug.GroupId == groupId);
+        var userGroup = await Table<DbUserGroup>()
+            .FirstOrDefaultAsync(ug => ug.GroupId == groupId && ug.UserId == playerId);
 
         await using var transaction = await Database.BeginTransactionAsync();