diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
index 0fc5cc415..3818e3cd1 100644
--- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
@@ -51,6 +51,7 @@ import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Statistics;
 import de.dennisguse.opentracks.data.models.Temperature;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackBuilder;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.data.statistics.SensorStatistics;
 import de.dennisguse.opentracks.data.tables.MarkerColumns;
@@ -232,12 +233,16 @@ public class ContentProviderUtils {
     /**
      * Inserts a track.
      * NOTE: This doesn't insert any trackPoints.
+     * NOTE: if the track.uuid is null, a random value will be assigned.
      *
      * @param track the track
      * @return the content provider URI of the inserted track.
      */
     public Track.Id insertTrack(Track track) {
-        //TODO Unset trackId
+        //TODO Unset trackId as it should be database generated
+        if (track.uuid() == null) {
+            track = new TrackBuilder(track, UUID.randomUUID()).getTrack();
+        }
         Uri uri = contentResolver.insert(CustomContentProvider.UrlType.TRACKS.getUri(), createContentValues(track));
         return new Track.Id(ContentUris.parseId(uri));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackBuilder.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackBuilder.java
index a1d7969cb..d13d1cc74 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/TrackBuilder.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackBuilder.java
@@ -57,6 +57,17 @@ public class TrackBuilder {
         this.trackStatistics = track.statistics();
     }
 
+    public TrackBuilder(Track track, UUID uuid) {
+        this.id = track.id();
+        this.uuid = uuid;
+        this.name = track.name();
+        this.description = track.description();
+        this.activityTypeLocalized = track.activityTypeLocalized();
+        this.activityType = track.activityType();
+        this.zoneOffset = track.zoneOffset();
+        this.trackStatistics = track.statistics();
+    }
+
     public void setName(String name) {
         this.name = name;
     }
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 0d24e9299..7fde618fb 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
@@ -30,5 +30,6 @@ import de.dennisguse.opentracks.data.models.Track;
  */
 public interface TrackExporter {
 
+    //TODO Pass track.Id instead of track?
     boolean writeTrack(List<Track> tracks, @NonNull OutputStream outputStream);
 }
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
index e46f5f21c..d261e979d 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
@@ -131,7 +131,7 @@ public class TrackImporter {
             }
 
             //TODO This is a workaround until we have proper UI.
-            trackData.uuid = UUID.randomUUID();
+            trackData.uuid = null;
         }
 
         trackPoints.sort(Comparator.comparing(TrackPoint::getTime));
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index bb9b00147..f44db458c 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -79,7 +79,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         trackId = contentProviderUtils.insertTrack(
                 new Track(
                         null,
-                        UUID.randomUUID(), //TODO This is not really cool: should happen in ContentProviderUtils?
+                        null,
                         "",
                         "",
                         activityTypeLocalized,