diff --git a/ErsatzTV.Core/Scheduling/PlaylistEnumerator.cs b/ErsatzTV.Core/Scheduling/PlaylistEnumerator.cs
index 68c3d2ef..7b984533 100644
--- a/ErsatzTV.Core/Scheduling/PlaylistEnumerator.cs
+++ b/ErsatzTV.Core/Scheduling/PlaylistEnumerator.cs
@@ -82,9 +82,9 @@ public class PlaylistEnumerator : IMediaCollectionEnumerator
 
     public int EnumeratorIndex => _enumeratorIndex;
 
-    public void SetEnumeratorIndex(int primaryHistoryIndex)
+    public void SetEnumeratorIndex(int enumeratorIndex)
     {
-        _enumeratorIndex = primaryHistoryIndex;
+        _enumeratorIndex = enumeratorIndex % _sortedEnumerators.Count;
     }
 
     public static async Task<PlaylistEnumerator> Create(