diff --git a/src/pages/AlbumDetail.vue b/src/pages/AlbumDetail.vue
index 6878507..b3c24da 100644
--- a/src/pages/AlbumDetail.vue
+++ b/src/pages/AlbumDetail.vue
@@ -44,6 +44,7 @@ function playTheAlbum(from: number = 0) {
 			album: album.value
 		})
 	}
+	playQueue.playMode.shuffle = false
 	playQueue.list = newPlayQueue
 	playQueue.currentIndex = from
 	playQueue.isPlaying = true
diff --git a/src/pages/Library.vue b/src/pages/Library.vue
index 090084b..82d66d2 100644
--- a/src/pages/Library.vue
+++ b/src/pages/Library.vue
@@ -31,6 +31,7 @@ function playTheList(list: 'favourites' | number, playFrom: number = 0) {
 		}))
 		playQueueStore.list = newPlayQueue.slice().reverse()
 		playQueueStore.currentIndex = playFrom
+		playQueueStore.playMode.shuffle = false
 		playQueueStore.isPlaying = true
 		playQueueStore.isBuffering = true
 	} else {