diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index 4165bb2f7cf..10e22c74527 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -334,6 +334,9 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
             List<CompetitorDTO> competitorList = getCompetitorDTOs(event.getCompetitors());
             List<RegattaDTO> regattasList = getRegattaDTOs(event, withRacePlaces);
             EventDTO eventDTO = new EventDTO(event.getName(), regattasList, competitorList);
+            for (RegattaDTO regatta : regattasList) {
+                regatta.setEvent(eventDTO);
+            }
             if (!eventDTO.regattas.isEmpty()) {
                 result.add(eventDTO);
             }
@@ -356,6 +359,9 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
             List<RaceDTO> raceDTOsInBoatClass = getRaceDTOs(event, e.getValue(), withRacePlaces);
             if (!raceDTOsInBoatClass.isEmpty()) {
                 RegattaDTO regatta = new RegattaDTO(new BoatClassDTO(e.getKey()==null?"":e.getKey().getName()), raceDTOsInBoatClass);
+                for (RaceDTO race : raceDTOsInBoatClass) {
+                    race.setRegatta(regatta);
+                }
                 result.add(regatta);
             }
         }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
index b2ef81d670e..fe2d7d25367 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
@@ -22,6 +22,8 @@ public class RaceDTO extends NamedDTO implements IsSerializable {
     
     public RacePlaceOrder racePlaces = null;
     
+    private RegattaDTO regatta;
+    
     public RaceDTO() {}
 
     public RaceDTO(String name, Iterable<CompetitorDTO> competitors, boolean currentlyTracked) {
@@ -29,6 +31,13 @@ public class RaceDTO extends NamedDTO implements IsSerializable {
         this.competitors = competitors;
         this.currentlyTracked = currentlyTracked;
     }
-    
+
+    public RegattaDTO getRegatta() {
+        return regatta;
+    }
+
+    public void setRegatta(RegattaDTO regatta) {
+        this.regatta = regatta;
+    }
     
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java
index a0b45397725..63b985ea9be 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java
@@ -7,6 +7,8 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 public class RegattaDTO implements IsSerializable {
     public BoatClassDTO boatClass;
     public List<RaceDTO> races;
+
+    private EventDTO event;
     
     public RegattaDTO() {}
 
@@ -15,5 +17,13 @@ public class RegattaDTO implements IsSerializable {
         this.boatClass = boatClass;
         this.races = races;
     }
+
+    public EventDTO getEvent() {
+        return event;
+    }
+
+    public void setEvent(EventDTO event) {
+        this.event = event;
+    }
     
 }