diff --git a/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs b/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
index 79d9b2fe1c..a64141f567 100644
--- a/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
+++ b/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
@@ -293,7 +293,7 @@ namespace BizHawk.Client.Common
 			{
 				if (_states[i].Frame > frame)
 				{
-					_nextStateIndex = (i + _firstStateIndex) & STATEMASK;
+					_nextStateIndex = i;
 					return true;
 				}
 			}