diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index df0b5bbcc7..3a407529ec 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
 		[RequiredService]
 		public IEmulator Emu { get; set; }
 
-		[RequiredService]
+		[OptionalService]
 		public IInputPollable InputPollableCore { get; set; }
 
 		[ConfigPersist]
@@ -270,7 +270,7 @@ namespace BizHawk.Client.EmuHawk
 
 				if (_autoSearch)
 				{
-					if (Settings.AutoSearchTakeLagFramesIntoAccount && InputPollableCore.IsLagFrame)
+					if (InputPollableCore != null && Settings.AutoSearchTakeLagFramesIntoAccount && InputPollableCore.IsLagFrame)
 					{
 						// Do nothing
 					}