diff --git a/persistence/album_repository.go b/persistence/album_repository.go
index c291098f9..71defa9db 100644
--- a/persistence/album_repository.go
+++ b/persistence/album_repository.go
@@ -184,9 +184,10 @@ func allRolesFilter(_ string, value interface{}) Sqlizer {
 }
 
 func (r *albumRepository) CountAll(options ...model.QueryOptions) (int64, error) {
-	sql := r.newSelect()
-	sql = r.withAnnotation(sql, "album.id")
-	return r.count(sql, options...)
+	query := r.newSelect()
+	query = r.withAnnotation(query, "album.id")
+	query = r.applyLibraryFilter(query)
+	return r.count(query, options...)
 }
 
 func (r *albumRepository) Exists(id string) (bool, error) {
diff --git a/persistence/artist_repository_test.go b/persistence/artist_repository_test.go
index 0dc0b087c..2b854b204 100644
--- a/persistence/artist_repository_test.go
+++ b/persistence/artist_repository_test.go
@@ -21,7 +21,7 @@ var _ = Describe("ArtistRepository", func() {
 	BeforeEach(func() {
 		DeferCleanup(configtest.SetupConfig())
 		ctx := log.NewContext(context.TODO())
-		ctx = request.WithUser(ctx, model.User{ID: "userid"})
+		ctx = request.WithUser(ctx, adminUser)
 		repo = NewArtistRepository(ctx, GetDBXBuilder())
 	})
 
diff --git a/persistence/folder_repository.go b/persistence/folder_repository.go
index 45ba168d6..96a9bae82 100644
--- a/persistence/folder_repository.go
+++ b/persistence/folder_repository.go
@@ -86,8 +86,9 @@ func (r folderRepository) GetAll(opt ...model.QueryOptions) ([]model.Folder, err
 }
 
 func (r folderRepository) CountAll(opt ...model.QueryOptions) (int64, error) {
-	sq := r.newSelect(opt...).Columns("count(*)")
-	return r.count(sq)
+	query := r.newSelect(opt...).Columns("count(*)")
+	query = r.applyLibraryFilter(query)
+	return r.count(query)
 }
 
 func (r folderRepository) GetLastUpdates(lib model.Library) (map[string]model.FolderUpdateInfo, error) {
diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index 1095d5f5d..8cfed88b3 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -116,6 +116,7 @@ func mediaFileRecentlyAddedSort() string {
 func (r *mediaFileRepository) CountAll(options ...model.QueryOptions) (int64, error) {
 	query := r.newSelect()
 	query = r.withAnnotation(query, "media_file.id")
+	query = r.applyLibraryFilter(query)
 	return r.count(query, options...)
 }