diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java
index e9231cde87f..233efb31d75 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java
@@ -201,9 +201,10 @@ public abstract class AbstractLeaderboardDTO implements Serializable {
 
     public int getTrackedRacesCount() {
         int result = 0;
-        for (RaceColumnDTO race : getRaceList()) {
-            for (FleetDTO fleet : race.getFleets()) {
-                if (race.isTrackedRace(fleet)) {
+        for (RaceColumnDTO raceColumn : getRaceList()) {
+            for (FleetDTO fleet : raceColumn.getFleets()) {
+                RaceDTO race = raceColumn.getRace(fleet);
+                if(race != null && race.trackedRace != null && race.trackedRace.hasGPSData && race.trackedRace.hasWindData) {
                     result++;
                 }
             }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java
index 3f9f7f4d4e6..bd61a4bbbd0 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java
@@ -127,7 +127,7 @@ public class EventRegattaRacesRace extends UIObject {
     private SimpleRaceStates getSimpleRaceState() {
         SimpleRaceStates simpleRaceState = SimpleRaceStates.NOT_TRACKED;
         
-        if(race != null && race.trackedRace != null) {
+        if(race != null && race.trackedRace != null && race.trackedRace.hasGPSData && race.trackedRace.hasWindData) {
             simpleRaceState = SimpleRaceStates.TRACKED;
             if(isLive()) {
                 simpleRaceState = SimpleRaceStates.TRACKED_AND_LIVE;