diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index ff8e7b843..ea2675c62 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -51,6 +51,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.CustomContentProvider;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver;
+import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.HandlerServer;
 import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTask;
@@ -86,6 +87,8 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
     private PeriodicTaskExecutor voiceExecutor;
     private TrackRecordingServiceNotificationManager notificationManager;
 
+    private final EGM2008CorrectionManager egm2008CorrectionManager = new EGM2008CorrectionManager();
+
     private Handler handler;
     private final Runnable updateRecordingData = new Runnable() {
         @Override
@@ -688,6 +691,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
         TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater);
         Pair<TrackPoint, SensorDataSet> current = localHandlerServer.createCurrentTrackPoint(lastTrackPoint);
 
+        egm2008CorrectionManager.correctAltitude(this, current.first);
         tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval);
         track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics());
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java b/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
index db36fcffc..69f576bdf 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
@@ -33,7 +33,6 @@ public class HandlerServer {
     private Clock clock = Clock.systemUTC();
 
     private final LocationHandler locationHandler;
-    private final EGM2008CorrectionManager egm2008CorrectionManager = new EGM2008CorrectionManager();
     private BluetoothRemoteSensorManager remoteSensorManager;
     private AltitudeSumManager altitudeSumManager;
 
@@ -116,10 +115,8 @@ public class HandlerServer {
 //            return;
 //        }
 
-        egm2008CorrectionManager.correctAltitude(context, trackPoint);
         fillAndReset(trackPoint);
 
-
 //        serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, thresholdHorizontalAccuracy));
         service.newTrackPoint(trackPoint, thresholdHorizontalAccuracy);
     }