diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c
index 441f5cf9433..c6810ef1253 100644
--- a/ntoskrnl/ke/amd64/kiinit.c
+++ b/ntoskrnl/ke/amd64/kiinit.c
@@ -446,6 +446,13 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 
         /* Initialize the PCR */
         KiInitializePcr(&KiInitialPcr, 0, &KiInitialThread.Tcb, KiP0DoubleFaultStack);
+
+        /* Setup the TSS descriptors and entries */
+        KiInitializeTss(&KiInitialPcr,
+                        KiInitialPcr.TssBase,
+                        KiP0BootStack,
+                        KiP0DoubleFaultStack,
+                        KiP0DoubleFaultStack);
     }
 
     /* Get Pcr from loader block */
@@ -473,13 +480,6 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
         /* Initialize the module list (ntos, hal, kdcom) */
         KiInitModuleList(LoaderBlock);
 
-        /* Setup the TSS descriptors and entries */
-        KiInitializeTss(Pcr,
-                        Pcr->TssBase,
-                        (PVOID)InitialStack,
-                        KiP0DoubleFaultStack,
-                        KiP0DoubleFaultStack);
-
         /* Setup the IDT */
         KeInitExceptions();