diff --git a/CHANGELOG.md b/CHANGELOG.md
index b444d16..2c1b86a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,10 @@
   * Warning: Using a value that is too high will result in system instability
 * Remove restart requirement to change auto skip setting
 * Rewrite startup enqueue
-* Fix deadlock issue on Windows (nyanmisaka)
-* Improve skip intro button styling & positioning (Fallenbagel)
+* Fix deadlock issue on Windows (#23 by @nyanmisaka)
+* Improve skip intro button styling & positioning (ConfusedPolarBear/jellyfin-web#91 by @Fallenbagel)
+* Order episodes by `IndexNumber` (#25 reported by @Flo56958)
+
 
 ## v0.1.0.0 (2022-06-09)
 * Add option to automatically skip intros
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs
index 7b1d86e..1db265d 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs
@@ -108,7 +108,7 @@ public class Entrypoint : IServerEntryPoint
         var query = new InternalItemsQuery()
         {
             ParentId = Guid.Parse(rawId),
-            OrderBy = new[] { ("SortName", SortOrder.Ascending) },
+            OrderBy = new[] { ("IndexNumber", SortOrder.Ascending) },
             IncludeItemTypes = new BaseItemKind[] { BaseItemKind.Episode },
             Recursive = true,
         };
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/FingerprinterTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/FingerprinterTask.cs
index 7647fda..0ba49ef 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/FingerprinterTask.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/FingerprinterTask.cs
@@ -173,7 +173,7 @@ public class FingerprinterTask : IScheduledTask
             return;
         }
 
-        _logger.LogInformation(
+        _logger.LogDebug(
             "Analyzing {Count} episodes from {Name} season {Season}",
             season.Value.Count,
             first.SeriesName,