1 files changed, 12 insertions, 16 deletions

diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index 8be6fd1b5..7c02e2550 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -90,16 +90,11 @@ namespace Jellyfin.Api.Controllers
                 .AddClientFields(Request)
                 .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
 
-            User? user = null;
+            User? user = userId is null || userId.Value.Equals(default)
+                ? null
+                : _userManager.GetUserById(userId.Value);
             BaseItem parentItem = _libraryManager.GetParentItem(parentId, userId);
 
-            if (userId.HasValue && !userId.Equals(Guid.Empty))
-            {
-                user = _userManager.GetUserById(userId.Value);
-            }
-
-            IList<BaseItem> items;
-
             var query = new InternalItemsQuery(user)
             {
                 ExcludeItemTypes = excludeItemTypes,
@@ -110,17 +105,18 @@ namespace Jellyfin.Api.Controllers
 
             bool Filter(BaseItem i) => FilterItem(i, excludeItemTypes, includeItemTypes, mediaTypes);
 
+            IList<BaseItem> items;
             if (parentItem.IsFolder)
             {
                 var folder = (Folder)parentItem;
 
-                if (!userId.Equals(Guid.Empty))
+                if (userId.Equals(default))
                 {
-                    items = recursive ? folder.GetRecursiveChildren(user, query).ToList() : folder.GetChildren(user, true).Where(Filter).ToList();
+                    items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToList();
                 }
                 else
                 {
-                    items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToList();
+                    items = recursive ? folder.GetRecursiveChildren(user, query).ToList() : folder.GetChildren(user, true).Where(Filter).ToList();
                 }
             }
             else
@@ -136,8 +132,6 @@ namespace Jellyfin.Api.Controllers
 
             IEnumerable<BaseItem> ibnItems = ibnItemsArray;
 
-            var result = new QueryResult<BaseItemDto> { TotalRecordCount = ibnItemsArray.Count };
-
             if (startIndex.HasValue || limit.HasValue)
             {
                 if (startIndex.HasValue)
@@ -155,8 +149,10 @@ namespace Jellyfin.Api.Controllers
 
             var dtos = tuples.Select(i => _dtoService.GetItemByNameDto(i.Item1, dtoOptions, i.Item2, user));
 
-            result.Items = dtos.Where(i => i != null).ToArray();
-
+            var result = new QueryResult<BaseItemDto>(
+                startIndex,
+                ibnItemsArray.Count,
+                dtos.Where(i => i != null).ToArray());
             return result;
         }
 
@@ -185,7 +181,7 @@ namespace Jellyfin.Api.Controllers
             var dtoOptions = new DtoOptions()
                 .AddClientFields(Request);
 
-            if (userId.HasValue && !userId.Equals(Guid.Empty))
+            if (userId.HasValue && !userId.Value.Equals(default))
             {
                 var user = _userManager.GetUserById(userId.Value);
                 return _dtoService.GetBaseItemDto(item, dtoOptions, user);