diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
index 66fcd6f0608..93522882a5c 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
@@ -373,7 +373,8 @@ public class EventManagementPanel extends FormPanel {
                                     // scan event's races:
                                     for (RegattaDAO regatta : event.regattas) {
                                         for (RaceDAO race : regatta.races) {
-                                            if (trackedEventsModel.getSelectionModel().isSelected(race)) {
+                                            if (trackedEventsModel.getSelectionModel().isSelected(regatta) ||
+                                                    trackedEventsModel.getSelectionModel().isSelected(race)) {
                                                 stopTrackingRace(event, race);
                                             }
                                         }