diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
index c56f15f..fedd3f6 100644
--- a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
+++ b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
@@ -196,7 +196,12 @@ public class TournamentPlayService {
       var event = getEventByType(tournament, eventType);
       playerSubstitution.setEvent(event);
 
-      var substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
+      TournamentPlayer substitute;
+      if (substitution.getSubstitute() != null) {
+        substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
+      } else {
+        substitute = null;
+      }
       playerSubstitution.setSubstitute(substitute);
       playerSubstitutions.add(playerSubstitution);
     }
@@ -307,7 +312,6 @@ public class TournamentPlayService {
     return null;
   }
 
-
   private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) {
     for (var tournamentPlayer : tournament.getTournamentPlayers()) {
       if (playerId.equals(tournamentPlayer.getPlayer().getId())) {