diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
index 1acabf226..8c39d8767 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
@@ -111,7 +111,7 @@ public class ExportImportTest {
         // when
         // 1. export
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        trackExporter.writeTrack(new Track[]{track}, outputStream);
+        trackExporter.writeTrack(track, outputStream);
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
@@ -147,7 +147,7 @@ public class ExportImportTest {
         // when
         // 1. export
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        trackExporter.writeTrack(new Track[]{track}, outputStream);
+        trackExporter.writeTrack(track, outputStream);
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
@@ -183,7 +183,7 @@ public class ExportImportTest {
         // when
         // 1. export
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        trackExporter.writeTrack(new Track[]{track}, outputStream);
+        trackExporter.writeTrack(track, outputStream);
 
         // 2. import
         InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
@@ -234,7 +234,7 @@ public class ExportImportTest {
         // when
         // 1. export
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        trackExporter.writeTrack(new Track[]{track}, outputStream);
+        trackExporter.writeTrack(track, outputStream);
         contentProviderUtils.deleteTrack(context, trackId);
 
         // 2. import
@@ -272,7 +272,7 @@ public class ExportImportTest {
         // when
         // 1. export
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        trackExporter.writeTrack(new Track[]{track}, outputStream);
+        trackExporter.writeTrack(track, outputStream);
 
         // 2. import
         InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java
index 4eb889e23..36287135c 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ExportProgressDialogFragment.java
@@ -218,7 +218,7 @@ public class ExportProgressDialogFragment extends DialogFragment {
             }
 
             try (OutputStream outputStream = context.getContentResolver().openOutputStream(file.getUri())) {
-                if (trackExporter.writeTrack(new Track[]{track}, outputStream)) {
+                if (trackExporter.writeTrack(track, outputStream)) {
                     return true;
                 } else {
                     if (!file.delete()) {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
index c9335155d..f850b37c2 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
@@ -54,6 +54,11 @@ public class FileTrackExporter implements TrackExporter {
         this.trackWriter = trackWriter;
     }
 
+    @Override
+    public boolean writeTrack(Track track, @NonNull OutputStream outputStream) {
+        return writeTrack(new Track[]{track}, outputStream);
+    }
+
     @Override
     public boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream) {
         try {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
index 3e1896834..5808129c2 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
@@ -69,6 +69,11 @@ public class KmzTrackExporter implements TrackExporter {
         this.exportPhotos = exportPhotos;
     }
 
+    @Override
+    public boolean writeTrack(Track track, @NonNull OutputStream outputStream) {
+        return writeTrack(new Track[]{track}, outputStream);
+    }
+
     @Override
     public boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream) {
         ZipOutputStream zipOutputStream = null;
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
index c87365f5f..b17592ca9 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
@@ -29,12 +29,7 @@ import de.dennisguse.opentracks.content.data.Track;
  */
 public interface TrackExporter {
 
-    /**
-     * Write track to an output stream.
-     * Depending on the implementation a context might be required.
-     *
-     * @param tracks
-     * @param outputStream the output stream
-     */
     boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream);
+
+    boolean writeTrack(Track track, @NonNull OutputStream outputStream);
 }