diff --git a/HalpoPlayer/View Models/DownloadsViewModel.swift b/HalpoPlayer/View Models/DownloadsViewModel.swift
index 7a90765..5e9291d 100644
--- a/HalpoPlayer/View Models/DownloadsViewModel.swift	
+++ b/HalpoPlayer/View Models/DownloadsViewModel.swift	
@@ -56,7 +56,7 @@ class DownloadsViewModel: ObservableObject {
 		AudioManager.shared.addSongToQueue(song: file.song)
 	}
 	func albumTapped(album: Album, coordinator: Coordinator) {
-		if SubsonicClient.shared.reachability?.connection == Reachability.Connection.unavailable {
+		if SubsonicClient.shared.reachability?.connection == Reachability.Connection.unavailable || AccountHolder.shared.offline {
 			coordinator.albumTappedOffline(album: album)
 		} else {
 			coordinator.albumTapped( albumId: album.id, scrollToSong: nil)
diff --git a/HalpoPlayer/View Models/LibraryViewModel.swift b/HalpoPlayer/View Models/LibraryViewModel.swift
index 24a69ef..e9627b5 100644
--- a/HalpoPlayer/View Models/LibraryViewModel.swift	
+++ b/HalpoPlayer/View Models/LibraryViewModel.swift	
@@ -141,7 +141,7 @@ class LibraryViewModel: ObservableObject {
 	}
 	func albumTapped(album: GetAlbumListResponse.Album, coordinator: Coordinator) {
 		let converted = Album(albumListResponse: album)
-		if SubsonicClient.shared.reachability?.connection == Reachability.Connection.unavailable {
+		if SubsonicClient.shared.reachability?.connection == Reachability.Connection.unavailable || AccountHolder.shared.offline {
 			coordinator.albumTappedOffline(album: converted)
 		} else {
 			coordinator.albumTapped(albumId: album.id, scrollToSong: nil)