diff --git a/BizHawk.Client.Common/movie/MovieService.cs b/BizHawk.Client.Common/movie/MovieService.cs
index 4f0fbde76d..280cf25223 100644
--- a/BizHawk.Client.Common/movie/MovieService.cs
+++ b/BizHawk.Client.Common/movie/MovieService.cs
@@ -31,8 +31,8 @@ namespace BizHawk.Client.Common
 
 				if (VersionInfo.DeveloperBuild)
 				{
-					movie.Load();
-					return movie.ToBk2();
+					//movie.Load();
+					return movie; //.ToBk2();
 				}
 				else
 				{
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 1468325b72..c87c7ad1ea 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Client.Common
 		}
 
 		public MultitrackRecording MultiTrack { get { return _multiTrack; } }
-		public IMovieController MovieControllerAdapter { get; private set; }
+		public IMovieController MovieControllerAdapter{ get; set; }
 
 		public IMovie Movie { get; set; }
 		public bool ReadOnly { get; set; }
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 9fd9845428..6447d44787 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -25,6 +25,7 @@ namespace BizHawk.Client.EmuHawk
 			Global.MovieSession = new MovieSession
 			{
 				Movie = movie,
+				MovieControllerAdapter = movie.LogGeneratorInstance().MovieControllerAdapter,
 				MessageCallback = GlobalWin.OSD.AddMessage,
 				AskYesNoCallback = StateErrorAskUser
 			};
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 1b4b1f35ff..0fd8673e34 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -79,6 +79,7 @@ namespace BizHawk.Client.EmuHawk
 			Global.MovieSession = new MovieSession
 			{
 				Movie = MovieService.DefaultInstance,
+				MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
 				MessageCallback = GlobalWin.OSD.AddMessage,
 				AskYesNoCallback = StateErrorAskUser
 			};