diff --git a/sdk/include/asm/trapamd64.inc b/sdk/include/asm/trapamd64.inc
index d3772689938..a4c1b844625 100644
--- a/sdk/include/asm/trapamd64.inc
+++ b/sdk/include/asm/trapamd64.inc
@@ -203,6 +203,8 @@ MACRO(ExitTrap, Flags)
 IntsEnabled:
 #endif
 
+    cli
+
     /* Swap gs to user mode */
     swapgs