diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs
index af755466de..23fb771c78 100644
--- a/BizHawk.MultiClient/MainForm.Movie.cs
+++ b/BizHawk.MultiClient/MainForm.Movie.cs
@@ -87,6 +87,11 @@ namespace BizHawk.MultiClient
 			if (Global.MovieSession.Movie.Mode != MOVIEMODE.INACTIVE)
 			{
 				LoadRom(CurrentlyOpenRom);
+				if (Global.MovieSession.Movie.StartsFromSavestate)
+				{
+					LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
+					Global.Emulator.ResetFrameCounter();
+				}
 				Global.MovieSession.Movie.StartPlayback();
 				SetMainformMovieInfo();
 			}