diff --git a/app/src/main/java/com/cappielloantonio/play/model/Song.java b/app/src/main/java/com/cappielloantonio/play/model/Song.java
index 53e758e6..d70fa204 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Song.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Song.java
@@ -50,7 +50,7 @@ public class Song implements Parcelable {
     public Song(Child child) {
         this.id = child.getId();
         this.title = child.getTitle();
-        this.trackNumber = child.getTrack();
+        this.trackNumber = child.getTrack() != null ? child.getTrack() : 0;
         this.discNumber = child.getDiscNumber() != null ? child.getDiscNumber() : 0;
         this.year = child.getYear() != null ? child.getYear() : 0;
         this.duration = child.getDuration();