diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 5f4c1c93ed..72cfbae791 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -235,12 +235,14 @@ namespace BizHawk.Client.Common
 				// if we have an appropriate buffer free, return it
 				if (_rewindBufferBacking != null)
 				{
-					var buf = _rewindBufferBacking;
-					_rewindBufferBacking = null;
-					if (buf.LongLength == size)
+					if (_rewindBufferBacking.LongLength == size)
 					{
+						var buf = _rewindBufferBacking;
+						_rewindBufferBacking = null;
 						return buf;
 					}
+
+					_rewindBufferBacking = null;
 				}
 
 				// otherwise, allocate it
diff --git a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
index b1bb851374..1ec2f9e157 100644
--- a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
+++ b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
@@ -65,6 +65,7 @@ namespace BizHawk.Client.Common
 			{
 				long capacity = 0;
 				_mBufferManage(_mAllocatedBuffer, ref capacity, false);
+				_mAllocatedBuffer = null;
 			}
 		}