diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java
index c60f1e17..1e4c44e6 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java
@@ -105,7 +105,9 @@ public class AlbumRepository {
                         List<Child> tracks = new ArrayList<>();
 
                         if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbum() != null) {
-                            tracks.addAll(response.body().getSubsonicResponse().getAlbum().getSongs());
+                            if (response.body().getSubsonicResponse().getAlbum().getSongs() != null) {
+                                tracks.addAll(response.body().getSubsonicResponse().getAlbum().getSongs());
+                            }
                         }
 
                         albumTracks.setValue(tracks);