diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
index 876bf849..08dd7fd7 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
@@ -281,12 +281,12 @@ class TrackCollectionFragment : Fragment() {
                 setTitle(name)
                 if (!isOffline() && Util.getShouldUseId3Tags()) {
                     if (isAlbum) {
-                        model.getAlbum(refresh, id!!, name, parentId!!)
+                        model.getAlbum(refresh, id!!, name, parentId)
                     } else {
                         model.getArtist(refresh, id!!, name)
                     }
                 } else {
-                    model.getMusicDirectory(refresh, id!!, name, parentId!!)
+                    model.getMusicDirectory(refresh, id!!, name, parentId)
                 }
             }
 
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
index 957df5d9..45b2d81a 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
@@ -45,7 +45,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
         refresh: Boolean,
         id: String,
         name: String?,
-        parentId: String
+        parentId: String?
     ) {
         withContext(Dispatchers.IO) {
 
@@ -53,7 +53,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
 
             var root = MusicDirectory()
 
-            if (allSongsId == id) {
+            if (allSongsId == id && parentId != null) {
                 val musicDirectory = service.getMusicDirectory(
                     parentId, name, refresh
                 )
@@ -152,7 +152,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
         }
     }
 
-    suspend fun getAlbum(refresh: Boolean, id: String, name: String?, parentId: String) {
+    suspend fun getAlbum(refresh: Boolean, id: String, name: String?, parentId: String?) {
 
         withContext(Dispatchers.IO) {
 
@@ -160,7 +160,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
 
             val musicDirectory: MusicDirectory
 
-            if (allSongsId == id) {
+            if (allSongsId == id && parentId != null) {
                 val root = MusicDirectory()
 
                 val songs: MutableCollection<MusicDirectory.Entry> = LinkedList()