From 0f42aa892e0a7fe2ac4e680e7647515af0909e5e Mon Sep 17 00:00:00 2001
From: theguymadmax <theguymadmax@proton.me>
Date: Wed, 1 Oct 2025 23:10:31 -0400
Subject: [PATCH] Fix BoxSet sorting (#14919)

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 MediaBrowser.Controller/Entities/Folder.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 9950e78525..e62004510f 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1351,6 +1351,14 @@ namespace MediaBrowser.Controller.Entities
             var realChildren = visibleChildren
                 .Where(e => query is null || UserViewBuilder.FilterItem(e, query))
                 .ToArray();
+
+            if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
+            {
+                realChildren = realChildren
+                    .OrderBy(e => e.ProductionYear ?? int.MaxValue)
+                    .ToArray();
+            }
+
             var childCount = realChildren.Length;
             if (result.Count < limit)
             {