diff --git a/src/main/java/de/dennisguse/opentracks/publicapi/StopRecording.java b/src/main/java/de/dennisguse/opentracks/publicapi/StopRecording.java
index 7988d8d83..0267b962c 100644
--- a/src/main/java/de/dennisguse/opentracks/publicapi/StopRecording.java
+++ b/src/main/java/de/dennisguse/opentracks/publicapi/StopRecording.java
@@ -1,11 +1,24 @@
 package de.dennisguse.opentracks.publicapi;
 
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.services.RecordingData;
 import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.util.ExportUtils;
 
 public class StopRecording extends AbstractAPIActivity {
 
     protected void execute(TrackRecordingService service) {
+        RecordingData recordingData = service.getRecordingDataObservable().getValue();
+        Track.Id trackId = null;
+        if (recordingData != null && recordingData.getTrack() != null) {
+            trackId = recordingData.getTrack().getId();
+        }
+
         service.endCurrentTrack();
+
+        if (trackId != null) {
+            ExportUtils.postWorkoutExport(this, trackId);
+        }
     }
 
     @Override