1 files changed, 5 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
index e39280a10..c5b00afb1 100644
--- a/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
@@ -34,6 +34,11 @@ namespace Emby.Server.Implementations.Sorting
                 throw new ArgumentNullException(nameof(y));
             }
 
+            if (!x.IndexNumber.HasValue && !y.IndexNumber.HasValue)
+            {
+                return 0;
+            }
+
             if (!x.IndexNumber.HasValue)
             {
                 return -1;