diff --git a/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerDto.java b/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerDto.java
index 1b2ccf3..d671d1d 100644
--- a/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerDto.java
+++ b/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerDto.java
@@ -10,6 +10,8 @@ import java.util.List;
 @Setter
 public class TournamentPlayerDto extends AbstractDto {
 
+    private Long id;
+
     private Long playerId;
 
     private String name;
diff --git a/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerSubstitutionDto.java b/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerSubstitutionDto.java
index db1c9e2..edf38b2 100644
--- a/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerSubstitutionDto.java
+++ b/src/main/java/nl/connectedit/swiss/dto/TournamentPlayerSubstitutionDto.java
@@ -11,5 +11,6 @@ public class TournamentPlayerSubstitutionDto extends AbstractDto {
 
   private String event;
 
-  private TournamentPlayerDto substitute;
+//  private TournamentPlayerDto substitute;
+  private Long substitute;
 }
diff --git a/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerMapper.java b/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerMapper.java
index e1bb0a4..68e24df 100644
--- a/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerMapper.java
+++ b/src/main/java/nl/connectedit/swiss/mapper/TournamentPlayerMapper.java
@@ -18,6 +18,7 @@ public class TournamentPlayerMapper implements DtoMapper<TournamentPlayer, Tourn
   @Override
   public TournamentPlayerDto toDto(TournamentPlayer tournamentPlayer) {
     var tournamentPlayerDto = new TournamentPlayerDto();
+    tournamentPlayerDto.setId(tournamentPlayer.getId());
     tournamentPlayerDto.setPlayerId(tournamentPlayer.getPlayer().getId());
     tournamentPlayerDto.setName(tournamentPlayer.getPlayer().getFullName());
     tournamentPlayerDto.setEvents(new ArrayList<>(tournamentPlayer.getEvents()));
@@ -41,7 +42,8 @@ public class TournamentPlayerMapper implements DtoMapper<TournamentPlayer, Tourn
     tournamentPlayerSubstitutionDto.setSubstitutionId(tournamentPlayerSubstitution.getId());
     tournamentPlayerSubstitutionDto.setEvent(tournamentPlayerSubstitution.getEvent().getType().name());
     if (tournamentPlayerSubstitution.getSubstitute() != null) {
-      tournamentPlayerSubstitutionDto.setSubstitute(toDto(tournamentPlayerSubstitution.getSubstitute()));
+//      tournamentPlayerSubstitutionDto.setSubstitute(toDto(tournamentPlayerSubstitution.getSubstitute()));
+      tournamentPlayerSubstitutionDto.setSubstitute(tournamentPlayerSubstitution.getSubstitute().getId());
     }
 
     return tournamentPlayerSubstitutionDto;
diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
index f0120d8..c56f15f 100644
--- a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
+++ b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
@@ -196,7 +196,7 @@ public class TournamentPlayService {
       var event = getEventByType(tournament, eventType);
       playerSubstitution.setEvent(event);
 
-      var substitute = getTournamentPlayer(tournament, substitution.getSubstitute().getPlayerId());
+      var substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
       playerSubstitution.setSubstitute(substitute);
       playerSubstitutions.add(playerSubstitution);
     }
@@ -298,6 +298,16 @@ public class TournamentPlayService {
     return tournament;
   }
 
+  private TournamentPlayer getTournamentPlayerById(Tournament tournament, Long id) {
+    for (var tournamentPlayer : tournament.getTournamentPlayers()) {
+      if (id.equals(tournamentPlayer.getId())) {
+        return tournamentPlayer;
+      }
+    }
+    return null;
+  }
+
+
   private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) {
     for (var tournamentPlayer : tournament.getTournamentPlayers()) {
       if (playerId.equals(tournamentPlayer.getPlayer().getId())) {