diff --git a/src/arch/i386/drivers/net/undiisr.S b/src/arch/i386/drivers/net/undiisr.S
index f1c9eb15..a6c6c381 100644
--- a/src/arch/i386/drivers/net/undiisr.S
+++ b/src/arch/i386/drivers/net/undiisr.S
@@ -64,7 +64,10 @@ chain:	/* Chain to next handler */
 	lcall	*undiisr_next_handler
 	
 exit:	/* Restore registers and return */
+	cli
 	popal
+	movzwl	%sp, %esp
+	addr32	movl -20(%esp), %esp	/* %esp isn't restored by popal */
 	popfl
 	popw	%gs
 	popw	%fs