diff --git a/ErsatzTV/Pages/MediaCollections.razor b/ErsatzTV/Pages/MediaCollections.razor index 52dd0fa2d..d34c2523a 100644 --- a/ErsatzTV/Pages/MediaCollections.razor +++ b/ErsatzTV/Pages/MediaCollections.razor @@ -91,7 +91,11 @@ _totalItems = aggregateData.Count; - _pagedData = aggregateData.Skip(state.Page * state.PageSize).Take(state.PageSize); + _pagedData = aggregateData + .Skip(_totalItems <= state.PageSize ? 0 : state.Page * state.PageSize) + .Take(state.PageSize) + .OrderBy(c => c.Name); + return new TableData { TotalItems = _totalItems, Items = _pagedData }; }