diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
index 54505c825..3fd020b15 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
@@ -22,7 +22,7 @@ public class IntervalStatisticsTest {
     private static final String TAG = IntervalStatisticsTest.class.getSimpleName();
 
     private List<TrackPoint> buildTrackPoints(int numberOfTrackPoints) {
-		Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(System.currentTimeMillis(), numberOfTrackPoints);
+		Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints);
 		List<TrackPoint> trackPoints = Arrays.asList(pair.second);
 
 		return trackPoints;
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java
index dbc711223..a6342e919 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java
@@ -14,6 +14,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProvider;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
@@ -109,7 +110,7 @@ public class IntervalsRecordingFragment extends Fragment implements IntervalList
             return;
         }
 
-        long trackId = PreferencesUtils.getRecordingTrackId(getContext());
+        Track.Id trackId = PreferencesUtils.getRecordingTrackId(getContext());
         viewModel.invalidate();
         LiveData<IntervalStatistics> liveData;
         if (interval == null) {
diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
index 0dcece702..a4d66e550 100644
--- a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
@@ -10,6 +10,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import java.util.List;
 
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -29,7 +30,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
         interval = IntervalOption.OPTION_1;
     }
 
-    public LiveData<IntervalStatistics> getIntervalStats(long trackId, IntervalOption interval) {
+    public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId, IntervalOption interval) {
         if (intervalStats == null || this.interval != interval) {
             intervalStats = new MutableLiveData<>();
             this.interval = interval;
@@ -38,7 +39,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
         return intervalStats;
     }
 
-    public LiveData<IntervalStatistics> getIntervalStats(long trackId) {
+    public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId) {
         return getIntervalStats(trackId, interval);
     }
 
@@ -49,7 +50,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
         intervalStats = null;
     }
 
-    private void loadIntervalStats(long trackId) {
+    private void loadIntervalStats(Track.Id trackId) {
         new Thread(() -> {
             Context context = getApplication().getApplicationContext();
             ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);