diff --git a/src/BizHawk.Client.Common/rewind/Zwinder.cs b/src/BizHawk.Client.Common/rewind/Zwinder.cs
index 231fab2daf..8444cf2291 100644
--- a/src/BizHawk.Client.Common/rewind/Zwinder.cs
+++ b/src/BizHawk.Client.Common/rewind/Zwinder.cs
@@ -24,7 +24,7 @@ namespace BizHawk.Client.Common
 		public Zwinder(int targetFrameLength, IBinaryStateable stateSource, IRewindSettings settings)
 		{
 			long targetSize = settings.BufferSize * 1024 * 1024;
-			bool kompress = settings.EnabledSmall;
+			bool kompress = settings.UseDelta;
 			if (targetSize < 65536)
 				throw new ArgumentOutOfRangeException(nameof(targetSize));
 			if (targetFrameLength < 1)
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 1a92abfb52..6c58b99b21 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -865,10 +865,18 @@ namespace BizHawk.Client.EmuHawk
 		public void CreateRewinder()
 		{
 			Rewinder?.Dispose();
-			Rewinder = Emulator.HasSavestates() && Config.Rewind.EnabledSmall // TODO: replace this with just a single "enabled"?
-				? new Zwinder(600, Emulator.AsStatable(), Config.Rewind)
-				// ? new Rewinder(Emulator.AsStatable(), Config.Rewind)
-				: null;
+
+			if (Config.Rewind.EnabledSmall)
+			{
+				Rewinder = Emulator.HasSavestates() && Config.Rewind.EnabledSmall // TODO: replace this with just a single "enabled"?
+					? new Zwinder(600, Emulator.AsStatable(), Config.Rewind)
+					// ? new Rewinder(Emulator.AsStatable(), Config.Rewind)
+					: null;
+			}
+			else
+			{
+				Rewinder = null;
+			}
 		}
 
 		private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;