diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardConfigPanel.java
index 0f33c2650b2..ee1d8a450ad 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardConfigPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardConfigPanel.java
@@ -592,7 +592,11 @@ public class LeaderboardConfigPanel extends FormPanel implements EventDisplayer,
         if (selectedRaces.isEmpty()) {
             unlinkRaceColumnFromTrackedRaceButton.setEnabled(false);
         } else {
-            linkTrackedRaceForRaceColumn(selectedRaces.iterator().next());
+            if (getSelectedRaceColumnName() != null) {
+                linkTrackedRaceForRaceColumn(selectedRaces.iterator().next());
+            } else {
+                unlinkRaceColumnFromTrackedRaceButton.setEnabled(false);
+            }
         }
     }