diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index aad9358588..7634c2938c 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -31,9 +31,7 @@ namespace BizHawk.Client.Common
 				throw new InvalidOperationException("Cannot create a TasMovie against a core that does not implement IStatable");
 			}
 
-			var core = Global.Emulator.AsStatable();
-
-			StateManager = new TasStateManager(this, core);
+			StateManager = new TasStateManager(this);
 			Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
 			Markers = new TasMovieMarkerList(this);
 			Markers.CollectionChanged += Markers_CollectionChanged;
@@ -48,9 +46,7 @@ namespace BizHawk.Client.Common
 				throw new InvalidOperationException("Cannot create a TasMovie against a core that does not implement IStatable");
 			}
 
-			var core = Global.Emulator.AsStatable();
-
-			StateManager = new TasStateManager(this, core);
+			StateManager = new TasStateManager(this);
 			Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
 			Markers = new TasMovieMarkerList(this);
 			Markers.CollectionChanged += Markers_CollectionChanged;
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 61de426f6b..8b3ac0b0e9 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -16,7 +16,15 @@ namespace BizHawk.Client.Common
 	/// </summary>
 	public class TasStateManager
 	{
-		private readonly IStatable Core;
+		// TODO: pass this in, and find a solution to a stale reference (this is instantiated BEFORE a new core instance is made, making this one stale if it is simply set in the constructor
+		private IStatable Core
+		{
+			get
+			{
+				return Global.Emulator.AsStatable();
+			}
+		}
+
 		private readonly SortedList<int, byte[]> States = new SortedList<int, byte[]>();
 
 		private readonly TasMovie _movie;
@@ -44,10 +52,9 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public TasStateManager(TasMovie movie, IStatable core)
+		public TasStateManager(TasMovie movie)
 		{
 			_movie = movie;
-			Core = core;
 
 			Settings = new TasStateManagerSettings(Global.Config.DefaultTasProjSettings);