diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
index 3008b1f570c..a786f924e26 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
@@ -172,6 +172,7 @@ public class FlexibleLeaderboardImpl extends AbstractLeaderboardImpl implements
         if (raceColumn != null) {
             for (Fleet fleet : raceColumn.getFleets()) {
                 raceLogStore.removeRaceLog(raceColumn.getRaceLogIdentifier(fleet));
+                raceColumn.getTrackedRace(fleet).detachRaceExecutionOrderProvider(raceExecutionOrderProvider);
             }
             races.remove(raceColumn);
             getRaceColumnListeners().notifyListenersAboutRaceColumnRemovedFromContainer(raceColumn);