diff --git a/Emby.Server.Implementations/Library/Search/SearchManager.cs b/Emby.Server.Implementations/Library/Search/SearchManager.cs
index ff14a1db3a..a5be3f07bd 100644
--- a/Emby.Server.Implementations/Library/Search/SearchManager.cs
+++ b/Emby.Server.Implementations/Library/Search/SearchManager.cs
@@ -185,7 +185,7 @@ public class SearchManager : ISearchManager
         }
 
         var candidateScores = BuildScoreLookup(candidates);
-        var user = !query.UserId.IsEmpty() ? _userManager.GetUserById(query.UserId) : null;
+        var user = query.UserId.IsEmpty() ? null : _userManager.GetUserById(query.UserId);
 
         var excludeItemTypes = BuildExcludeItemTypes(query);
         var includeItemTypes = BuildIncludeItemTypes(query);
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 679f6fafc2..15c2e922f8 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -386,8 +386,8 @@ public class ItemsController : BaseJellyfinApiController
                 Recursive = recursive ?? false,
                 OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder),
                 IsFavorite = isFavorite,
-                Limit = searchResultScores is not null ? null : limit,
-                StartIndex = searchResultScores is not null ? null : startIndex,
+                Limit = searchResultScores is null ? limit : null,
+                StartIndex = searchResultScores is null ? startIndex : null,
                 IsMissing = isMissing,
                 IsUnaired = isUnaired,
                 CollapseBoxSetItems = collapseBoxSetItems,