diff --git a/src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java b/src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java
index a2e89de..9e34731 100644
--- a/src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java
+++ b/src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java
@@ -97,7 +97,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
       for (var group : event.getGroups()) {
         for (var round : group.getRounds()) {
           for (var match : round.getMatches()) {
-            if (match.getStatus() == Status.IN_PROGRESS) {
+            if (match.getStatus() == Status.IN_PROGRESS && match.getCounter() != null) {
               var counter = getTournamentPlayerFromPlayerId(tournament, match.getCounter().getId());
               if (counter != null) {
                 playersCounting.add(counter.getId());