diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java
index a53c4316abf..1e8a53ca1e6 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java
@@ -157,7 +157,7 @@ public class LeaderboardsResourceV2 extends AbstractLeaderboardsResource {
                 BoatDTO entryBoatDTO = leaderboardEntry.boat;
                 if (entryBoatDTO != null) {
                     JSONObject jsonBoat = new JSONObject();
-                    writeBoatData(jsonBoat, rowBoatDTO);
+                    writeBoatData(jsonBoat, entryBoatDTO);
                     jsonCompetitor.put("boat", jsonBoat);
                 }
                 final FleetDTO fleetOfCompetitor = leaderboardEntry.fleet;