diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c
index 3c663cbddbc..c1ed2d0a9d7 100644
--- a/ntoskrnl/kdbg/kdb.c
+++ b/ntoskrnl/kdbg/kdb.c
@@ -202,7 +202,7 @@ KdbpOverwriteInstruction(
             /* Detach from process */
             if (CurrentProcess != Process)
             {
-                KeDetachProcess();
+                KeUnstackDetachProcess(&ApcState);
             }
 
             return Status;