diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
index 58106d52c59..0bc698f144c 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
@@ -20,6 +20,7 @@ import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.safehtml.client.SafeHtmlTemplates;
 import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.cellview.client.CellTable;
 import com.google.gwt.user.cellview.client.Column;
 import com.google.gwt.user.cellview.client.ColumnSortEvent;
@@ -290,11 +291,15 @@ public class LeaderboardConfigPanel extends FormPanel implements EventDisplayer,
         Column<RaceInLeaderboardDTO, SafeHtml> raceLinkColumn = new Column<RaceInLeaderboardDTO, SafeHtml>(raceAnchorCell) {
             @Override
             public SafeHtml getValue(RaceInLeaderboardDTO raceInLeaderboardDTO) {
-                EventNameAndRaceName raceIdentifier = (EventNameAndRaceName) raceInLeaderboardDTO.getRaceIdentifier();
-                String link = "/gwt/RaceBoard.html?leaderboardName="+ selectedLeaderboard.name + 
-                                "&raceName=" + raceIdentifier.getRaceName() +
-                                "&eventName=" + raceIdentifier.getEventName();
-                return ANCHORTEMPLATE.cell(link, raceInLeaderboardDTO.getRaceColumnName());
+                if(raceInLeaderboardDTO.getRaceIdentifier() != null) {
+                    EventNameAndRaceName raceIdentifier = (EventNameAndRaceName) raceInLeaderboardDTO.getRaceIdentifier();
+                    String link = "/gwt/RaceBoard.html?leaderboardName="+ selectedLeaderboard.name + 
+                            "&raceName=" + raceIdentifier.getRaceName() +
+                            "&eventName=" + raceIdentifier.getEventName();
+                    return ANCHORTEMPLATE.cell(link, raceInLeaderboardDTO.getRaceColumnName());
+                } else {
+                    return SafeHtmlUtils.fromString(raceInLeaderboardDTO.getRaceColumnName());
+                }
             }
         };