diff --git a/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs b/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
index 17329eefa7..b4b620b900 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
@@ -159,7 +159,7 @@ namespace BizHawk.Client.Common
 				.OrderByDescending(s => s.Frame);
 		}
 
-		public int Last => AllStates().First().Frame;
+		public int Last => StateCache.Max();
 
 		private int LastRing => CurrentAndRecentStates().FirstOrDefault()?.Frame ?? 0;