diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index c804d24f695..f931aff2edf 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1239,7 +1239,7 @@ static void Interrupt(void)
 	I.IREQ &= ~I.ISRV; // remove serviced IRQ flag
 	RIM_IEN = (I.ISRV==IM_TRAP) ? I.IM & IM_IEN : 0; // latch general interrupt enable bit on TRAP or NMI
 //ZT
-	I.IM &= ~IM_IEN;		/* remove general interrupt enable bit */
+	//I.IM &= ~IM_IEN;		/* remove general interrupt enable bit */
 
 	if( I.ISRV == IM_INTR )
 	{
@@ -1298,6 +1298,7 @@ static void Interrupt(void)
 					execute_one(I.IRQ1 & 0xff);
 			}
 	}
+	I.ISRV = 0;
 }
 
 static CPU_EXECUTE( i8085 )