diff --git a/common/lib/src/editors/tracks.dart b/common/lib/src/editors/tracks.dart
index eb76ebc..7b4c92e 100644
--- a/common/lib/src/editors/tracks.dart
+++ b/common/lib/src/editors/tracks.dart
@@ -47,7 +47,9 @@ class _TracksEditorState extends State<TracksEditor> {
                   fileName: trackModel.fileName,
                   recordingId: recordingInfo.recording.id,
                   index: i,
-                  partIds: [trackModel.workPartIndex],
+                  partIds: trackModel.workPartIndex != null
+                      ? [trackModel.workPartIndex]
+                      : [],
                 ));
               }