diff --git a/BizHawk.Client.Common/Api/Classes/MovieApi.cs b/BizHawk.Client.Common/Api/Classes/MovieApi.cs
index a4a6c27f9a..fb1bb53dfd 100644
--- a/BizHawk.Client.Common/Api/Classes/MovieApi.cs
+++ b/BizHawk.Client.Common/Api/Classes/MovieApi.cs
@@ -125,7 +125,7 @@ namespace BizHawk.Client.Common
 
 		public void SetRerecordCounting(bool counting) => Global.MovieSession.Movie.IsCountingRerecords = counting;
 
-		public void Stop() => Global.MovieSession.Movie.Stop();
+		public void Stop() => Global.MovieSession.StopMovie();
 
 		public double GetFps()
 		{
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 24c92beada..ada470d0f8 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -352,6 +352,7 @@ namespace BizHawk.Client.Common
 
 			MultiTrack.Restart(Global.Emulator.ControllerDefinition.PlayerCount);
 			_modeChangedCallback();
+			Movie = MovieService.DefaultInstance;
 		}
 
 		private void ClearFrame()
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index f64c397a0d..73505a42f5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -279,11 +279,9 @@ namespace BizHawk.Client.EmuHawk
 				if (Tools.AskSave())
 				{
 					// zero 03-nov-2015 - close game after other steps. tools might need to unhook themselves from a core.
-					MovieSession.Movie.Stop();
+					MovieSession.StopMovie();
 					Tools.Close();
 					CloseGame();
-
-					// does this need to be last for any particular reason? do tool dialogs persist settings when closing?
 					SaveConfig();
 				}
 				else
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index f226f8e5d7..dd92aa1ca9 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -830,7 +830,6 @@ namespace BizHawk.Client.EmuHawk
 		{
 			MainForm.PauseOnFrame = null;
 			MainForm.AddOnScreenMessage("TAStudio disengaged");
-			MovieSession.Movie = MovieService.DefaultInstance;
 			MainForm.TakeBackControl();
 			Config.MovieEndAction = _originalEndAction;
 			MainForm.SetMainformMovieInfo();