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 8aa0618eedb..800a562472d 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
@@ -6147,8 +6147,13 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
      */
     private Iterable<GPSFixDTO> convertToGPSFixDTOTrack(Track<? extends GPSFix> track) {
         final List<GPSFixDTO> result = new ArrayList<>();
-        for (final GPSFix fix : track.getFixes()) {
-            result.add(convertToGPSFixDTO(fix));
+        track.lockForRead();
+        try {
+            for (final GPSFix fix : track.getFixes()) {
+                result.add(convertToGPSFixDTO(fix));
+            }
+        } finally {
+            track.unlockAfterRead();
         }
         return result;
     }