diff --git a/BizHawk.Client.Common/SaveSlotManager.cs b/BizHawk.Client.Common/SaveSlotManager.cs
index 21a04c3e84..c6a3f150d1 100644
--- a/BizHawk.Client.Common/SaveSlotManager.cs
+++ b/BizHawk.Client.Common/SaveSlotManager.cs
@@ -45,6 +45,11 @@ namespace BizHawk.Client.Common
 		{
 			get
 			{
+				if (!Global.Emulator.HasSavestates())
+				{
+					return false;
+				}
+
 				Update();
 				return _slots.Any(slot => slot);
 			}
@@ -52,7 +57,7 @@ namespace BizHawk.Client.Common
 
 		public bool HasSlot(int slot)
 		{
-			if (Global.Emulator.IsNull())
+			if (!Global.Emulator.HasSavestates())
 			{
 				return false;
 			}