diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
index 2e32dbeb9c6..5264fffa55a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
@@ -656,15 +656,11 @@ public class RaceMap implements TimeListener, CompetitorSelectionChangeListener,
 
     private Iterable<CompetitorDAO> getCompetitorsToShow() {
         Iterable<CompetitorDAO> result;
-        if (getSettings().isShowOnlySelectedCompetitors() && Util.isEmpty(competitorSelection.getSelectedCompetitors())) {
+        Iterable<CompetitorDAO> selection = competitorSelection.getSelectedCompetitors();
+        if (!getSettings().isShowOnlySelectedCompetitors() || Util.isEmpty(selection)) {
             result = competitorSelection.getAllCompetitors();
         } else {
-            Iterable<CompetitorDAO> selection = competitorSelection.getSelectedCompetitors();
-            if (Util.isEmpty(selection)) {
-                result = competitorSelection.getAllCompetitors();
-            } else {
-                result = selection;
-            }
+            result = selection;
         }
         return result;
     }