diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c
index 50f011c7f02..c1b01dec20b 100644
--- a/ntoskrnl/kd/kdio.c
+++ b/ntoskrnl/kd/kdio.c
@@ -56,7 +56,6 @@ static ULONG KdbgNextApiNumber = DbgKdContinueApi;
 static CONTEXT KdbgContext;
 static EXCEPTION_RECORD64 KdbgExceptionRecord;
 static BOOLEAN KdbgFirstChanceException;
-static KPROCESSOR_MODE KdbgPreviousMode;
 static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS;
 
 /* LOCKING FUNCTIONS *********************************************************/
@@ -581,7 +580,6 @@ KdSendPacket(
             KdbgNextApiNumber = DbgKdGetContextApi;
             KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord;
             KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance;
-            KdbgPreviousMode = ((PKTHREAD)(ULONG_PTR)WaitStateChange->Thread)->PreviousMode;
             return;
         }
     }
@@ -601,7 +599,7 @@ KdSendPacket(
             }
 
             Result = KdbEnterDebuggerException(&KdbgExceptionRecord,
-                                               KdbgPreviousMode,
+                                               KdbgContext.SegCs & 1,
                                                &KdbgContext,
                                                KdbgFirstChanceException);
 #else