diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 6f4815c516..6e6ad15721 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -155,6 +155,11 @@ namespace BizHawk.Client.Common
 
 		public bool HasState(int frame)
 		{
+			if (_movie.StartsFromSavestate && frame == 0)
+			{
+				return true;
+			}
+			
 			return States.ContainsKey(frame);
 		}