diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/LibFz80.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/LibFz80.cs
index 726755741a..f6f4e18390 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/LibFz80.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/LibFz80.cs
@@ -177,12 +177,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
 
 		public void ExecuteOne()
 		{
-			if (INT == 1 && Z80.iff1 > 0)
+			if (INT == 1 && Z80.iff1 == 0 && Z80.iff2 == 0)
 			{
 				TraceCallback?.Invoke(new(disassembly: "====IRQ====", registerInfo: string.Empty));
 			}
 
-			if (NMI == 1)
+			if (NMI == 1 && Z80.iff1 == 0 && Z80.iff2 == 0)
 			{
 				TraceCallback?.Invoke(new(disassembly: "====NMI====", registerInfo: string.Empty));
 			}