diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c
index 6548a385651..71d4179843a 100644
--- a/ntoskrnl/ke/amd64/thrdini.c
+++ b/ntoskrnl/ke/amd64/thrdini.c
@@ -77,10 +77,11 @@ KiInitializeContextThread(IN PKTHREAD Thread,
 
         /* Zero out the trap frame */
         RtlZeroMemory(TrapFrame, sizeof(KTRAP_FRAME));
+        RtlZeroMemory(&InitFrame->ExceptionFrame, sizeof(KEXCEPTION_FRAME));
 
         /* Set up a trap frame from the context. */
         KeContextToTrapFrame(Context,
-                             NULL,
+                             &InitFrame->ExceptionFrame,
                              TrapFrame,
                              CONTEXT_AMD64 | ContextFlags,
                              UserMode);