diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 53aea44454..2d0ed045cb 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -137,7 +137,10 @@ namespace BizHawk.Client.Common
 
 		public void Rewind(int frames)
 		{
-			_rewindThread.Rewind(frames);
+			if (Global.Emulator.HasSavestates())
+			{
+				_rewindThread.Rewind(frames);
+			}
 		}
 
 		// TODO remove me