diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
index 15bfcba7f6..fd5e34117f 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
@@ -148,10 +148,10 @@ namespace BizHawk.Client.Common
 		
 		protected virtual void LoadFields(ZipStateLoader bl, bool preload)
 		{
-			LoadBk2Fields(bl);
+			LoadBk2Fields(bl, preload);
 		}
 		
-		protected void LoadBk2Fields(ZipStateLoader bl)
+		protected void LoadBk2Fields(ZipStateLoader bl, bool preload)
 		{
 			bl.GetLump(BinaryStateLump.Movieheader, true, delegate(TextReader tr)
 			{
@@ -173,6 +173,18 @@ namespace BizHawk.Client.Common
 				}
 			});
 
+			bl.GetLump(BinaryStateLump.Input, true, delegate(TextReader tr)
+			{
+				IsCountingRerecords = false;
+				ExtractInputLog(tr, out _);
+				IsCountingRerecords = true;
+			});
+
+			if (preload)
+			{
+				return;
+			}
+
 			bl.GetLump(BinaryStateLump.Comments, false, delegate(TextReader tr)
 			{
 				string line;
@@ -211,13 +223,6 @@ namespace BizHawk.Client.Common
 				}
 			});
 
-			bl.GetLump(BinaryStateLump.Input, true, delegate(TextReader tr)
-			{
-				IsCountingRerecords = false;
-				ExtractInputLog(tr, out _);
-				IsCountingRerecords = true;
-			});
-
 			if (StartsFromSavestate)
 			{
 				bl.GetCoreState(
diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index aef71a1e93..7a644e229f 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -63,11 +63,14 @@ namespace BizHawk.Client.Common
 		
 		protected override void LoadFields(ZipStateLoader bl, bool preload)
 		{
-			LoadBk2Fields(bl);
-			LoadTasprojExtras(bl, preload);
+			LoadBk2Fields(bl, preload);
+			if (!preload)
+			{
+				LoadTasprojExtras(bl);
+			}
 		}
 		
-		private void LoadTasprojExtras(ZipStateLoader bl, bool preload)
+		private void LoadTasprojExtras(ZipStateLoader bl)
 		{
 			bl.GetLump(BinaryStateLump.LagLog, false, delegate(TextReader tr)
 			{
@@ -153,15 +156,12 @@ namespace BizHawk.Client.Common
 				}
 			});
 
-			if (!preload)
+			if (TasStateManager.Settings.SaveStateHistory)
 			{
-				if (TasStateManager.Settings.SaveStateHistory)
+				bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
 				{
-					bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
-					{
-						TasStateManager.Load(br);
-					});
-				}
+					TasStateManager.Load(br);
+				});
 			}
 		}
 	}