diff --git a/android/app/src/main/kotlin/com/novasonic/app/viewmodel/LibraryViewModel.kt b/android/app/src/main/kotlin/com/novasonic/app/viewmodel/LibraryViewModel.kt
index 5ee94ba..fca9a91 100644
--- a/android/app/src/main/kotlin/com/novasonic/app/viewmodel/LibraryViewModel.kt
+++ b/android/app/src/main/kotlin/com/novasonic/app/viewmodel/LibraryViewModel.kt
@@ -43,7 +43,7 @@ class LibraryViewModel(app: Application) : AndroidViewModel(app) {
     fun selectTab(tab: LibraryTab) {
         _state.value = _state.value.copy(tab = tab)
         when (tab) {
-            LibraryTab.ALBUMS    -> if (_state.value.albums.isEmpty())    loadAlbums()
+            LibraryTab.ALBUMS    -> if (_state.value.albumsByNewest.isEmpty() && _state.value.albumsByName.isEmpty()) loadAlbums()
             LibraryTab.ARTISTS   -> if (_state.value.artistIndexes.isEmpty()) loadArtists()
             LibraryTab.PLAYLISTS -> if (_state.value.playlists.isEmpty()) loadPlaylists()
         }