diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index 2db15aa66e9..ed03ad0920d 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -8188,7 +8188,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
         if (leaderboard != null && leaderboard instanceof RegattaLeaderboard) {
             for (final RaceColumn raceColumn : leaderboard.getRaceColumns()) {
                 for (final Mark availableMark : raceColumn.getAvailableMarks()) {
-                    if (availableMark.getId().toString().equals(markId)) {
+                    if (Util.equalsWithNull(availableMark.getId(), markId)) {
                         result = convertToMarkDTO((RegattaLeaderboard) leaderboard, availableMark);
                         break;
                     }