diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index e36fc0eadc..abcc6566d9 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 		isPorted: true,
 		isReleased: true
 		)]
-	public unsafe class Octoshock : IEmulator, IVideoProvider, ISyncSoundProvider, ISaveRam, IStatable, IDriveLight, ISettable<Octoshock.Settings, Octoshock.SyncSettings>, IDebuggable, IRegionable
+	public unsafe class Octoshock : IEmulator, IVideoProvider, ISyncSoundProvider, ISaveRam, IStatable, IDriveLight, ISettable<Octoshock.Settings, Octoshock.SyncSettings>, IDebuggable, IRegionable, IInputPollable
 	{
 		public string SystemId { get { return "PSX"; } }
 
@@ -770,6 +770,13 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 		public int LagCount { get; set; }
 		public bool IsLagFrame { get; private set; }
 
+		public IInputCallbackSystem InputCallbacks
+		{
+			[FeatureNotImplemented]
+			get
+			{ throw new NotImplementedException(); }
+		}
+
 		[FeatureNotImplemented]
 		public bool DeterministicEmulation { get { return true; } }