diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 672a3884c8..e6a998edb6 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1337,6 +1337,9 @@ namespace BizHawk.MultiClient
 				StateSlots.Clear();
 				UpdateStatusSlots();
 				UpdateDumpIcon();
+
+				LastState = Global.Emulator.SaveStateBinary();
+
 				return true;
 			}
 		}
diff --git a/BizHawk.MultiClient/Rewind.cs b/BizHawk.MultiClient/Rewind.cs
index 37bf02bc22..07544e05a6 100644
--- a/BizHawk.MultiClient/Rewind.cs
+++ b/BizHawk.MultiClient/Rewind.cs
@@ -25,19 +25,6 @@ namespace BizHawk.MultiClient
 										Global.OSD.AddMessage("See 'Arcade Card Rewind Hack' in Emulation->PC Engine options.");
                 }
 
-                var ms = new MemoryStream();
-                var writer = new BinaryWriter(ms);
-                for (int i = 0; i < LastState.Length; i++)
-                {
-                    if (i == 254 || i == LastState.Length - 1)
-                    {
-                        writer.Write((byte)(i + 1));
-                        writer.Write((ushort) 0);
-                        writer.Write(LastState, 0, i + 1);
-                    }
-                }
-                RewindBuf.Push(ms);
-
 				return;
 			}