diff --git a/BizHawk.Client.Common/inputAdapters/InputManager.cs b/BizHawk.Client.Common/inputAdapters/InputManager.cs
index df4fd12470..4f9f2410d8 100644
--- a/BizHawk.Client.Common/inputAdapters/InputManager.cs
+++ b/BizHawk.Client.Common/inputAdapters/InputManager.cs
@@ -25,7 +25,7 @@ namespace BizHawk.Client.Common
 
 			// connect the movie session before MovieOutputHardpoint if it is doing anything
 			// otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session
-			if (Global.MovieSession.Movie != null)
+			if (Global.MovieSession.Movie.IsPlaying && Global.MovieSession.Movie.IsRecording)
 			{
 				Global.MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter;
 			}
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 9974976846..bb6564bbce 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -255,6 +255,8 @@ namespace BizHawk.Client.Common
 			{
 				LatchInputFromLog();
 
+				InputManager.RewireInputChain();
+
 				if (Movie.IsRecording) // The movie end situation can cause the switch to record mode, in that case we need to capture some input for this frame
 				{
 					HandleFrameLoopForRecordMode();