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 d6ddf8f5c8..1b02f2ae41 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
@@ -387,7 +387,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);
     }
@@ -507,7 +508,7 @@ public sealed partial class BaseItemRepository
 
         var leafItems = context.BaseItems
             .AsNoTracking()
-            .Where(b => !b.IsFolder && !b.IsVirtualItem);
+            .Where(DescendantQueryHelper.IsCountableLeaf);
         leafItems = ApplyAccessFiltering(context, leafItems, filter);
 
         var playedLeafItems = leafItems