diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
index 295491481..9fa0e192b 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
@@ -41,7 +41,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 public class TrackNameUtilsTest {
 
     private static final Track.Id TRACK_ID = new Track.Id(1L);
-    private static final OffsetDateTime START_TIME = OffsetDateTime.parse("2022-01-02T10:15:30+01:00");
+    private static final OffsetDateTime START_TIME = OffsetDateTime.parse("2022-01-02T10:15:30.1234+01:00");
 
     private static final Context CONTEXT = ApplicationProvider.getApplicationContext();
 
@@ -60,7 +60,7 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_date_iso_8601() {
         PreferencesUtils.setString(R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
-        assertEquals(StringUtils.formatDateTimeIso8601(START_TIME.toInstant(), START_TIME.getOffset()), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals("2022-01-02T10:15+01", TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
index 6b47bed34..264ceb582 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.util;
 import android.content.Context;
 
 import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Track;
@@ -41,7 +42,7 @@ public class TrackNameUtils {
         if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) {
             return StringUtils.formatDateTimeWithOffset(startTime);
         } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
-            return StringUtils.formatDateTimeIso8601(startTime.toInstant(), startTime.getOffset());
+            return startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mmX"));
         } else {
             return context.getString(R.string.track_name_format, trackId.getId());
         }