1 files changed, 3 insertions, 2 deletions
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
index 80e16ca310..524a712776 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
@@ -390,7 +390,8 @@ public sealed partial class BaseItemRepository
 
         var baseQuery = context.BaseItems
             .AsNoTracking()
-            .Where(b => allDescendantIds.Contains(b.Id) && !b.IsFolder && !b.IsVirtualItem);
+            .Where(b => allDescendantIds.Contains(b.Id))
+            .Where(DescendantQueryHelper.IsCountableLeaf);
 
         return ApplyAccessFiltering(context, baseQuery, filter);
     }
@@ -510,7 +511,7 @@ public sealed partial class BaseItemRepository
 
         var leafItems = context.BaseItems
             .AsNoTracking()
-            .Where(e => !e.IsFolder && !e.IsVirtualItem);
+            .Where(DescendantQueryHelper.IsCountableLeaf);
 
         return ApplyAccessFiltering(context, leafItems, new InternalItemsQuery(user) { IncludeOwnedItems = includeOwnedItems });
     }