diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
index ae8531de539..e8deff72e4c 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
@@ -90,6 +90,11 @@ public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest {
 
     protected void testRace(String raceNumber) throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
         setUp(raceNumber);
+        synchronized (getSemaphor()) {
+            while (!isStoredDataLoaded()) {
+                getSemaphor().wait();
+            }
+        }
         testWholeRace();
         testMiddleOfRace(0);
         testMiddleOfRace(2);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
index daf095f0528..7d290ed6968 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
@@ -103,8 +103,6 @@ public class EditMarkPassingsPanel extends AbsolutePanel implements Component<Ab
         this.stringMessages = stringMessages;
         competitorSelectionModel.addCompetitorSelectionChangeListener(this);
 
-        setVisible(false);
-
         // Waypoint list
         currentWaypoints = new ArrayList<>();
         waypointList = new ListDataProvider<>();
@@ -269,6 +267,7 @@ public class EditMarkPassingsPanel extends AbsolutePanel implements Component<Ab
         });
         selectCompetitorLabel.setText(stringMessages.selectCompetitor());
         refreshWaypoints();
+        setVisible(false);
         HorizontalPanel tableAndButtons = new HorizontalPanel();
         add(tableAndButtons, 0, 0);
         tableAndButtons.setSpacing(3);
@@ -283,20 +282,27 @@ public class EditMarkPassingsPanel extends AbsolutePanel implements Component<Ab
         buttonPanel.add(selectCompetitorLabel);
         enableButtons();
     }
+    
+    @Override
+    public void setVisible(boolean visible) {
+        processCompetitorSelectionChange(visible);
+        super.setVisible(visible);
+        
+    }
 
     @Override
     public void addedToSelection(CompetitorDTO competitor) {
-        processCompetitorSelectionChange();
+        processCompetitorSelectionChange(isVisible());
     }
 
     @Override
     public void removedFromSelection(CompetitorDTO competitor) {
-        processCompetitorSelectionChange();
+        processCompetitorSelectionChange(isVisible());
     }
 
-    private void processCompetitorSelectionChange() {
+    private void processCompetitorSelectionChange(boolean visible) {
             waypointSelectionModel.clear();
-            if (isVisible() && Util.size(competitorSelectionModel.getSelectedCompetitors()) == 1) {
+            if (visible && Util.size(competitorSelectionModel.getSelectedCompetitors()) == 1) {
                 selectCompetitorLabel.setText("");
                 refillList();
             } else {
@@ -309,6 +315,7 @@ public class EditMarkPassingsPanel extends AbsolutePanel implements Component<Ab
         waypointList.getList().clear();
         clearInfo();
     }
+    
 
     private void refillList() {
         clearInfo();