diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index a0f58190824..d1479be33b0 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -855,13 +855,13 @@ void i8085a_cpu_device::execute_run()
 
 	do
 	{
-		debugger_instruction_hook(m_PC.d);
-
 		/* the instruction after an EI does not take an interrupt, so
 		   we cannot check immediately; handle post-EI behavior here */
 		if (m_after_ei != 0 && --m_after_ei == 0)
 			check_for_interrupts();
 
+		debugger_instruction_hook(m_PC.d);
+
 		/* here we go... */
 		execute_one(read_op());