diff --git a/reactos/ntoskrnl/include/internal/i386/trap_x.h b/reactos/ntoskrnl/include/internal/i386/trap_x.h
index 08acc3f647c..862403f9e64 100644
--- a/reactos/ntoskrnl/include/internal/i386/trap_x.h
+++ b/reactos/ntoskrnl/include/internal/i386/trap_x.h
@@ -153,6 +153,8 @@ KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame,
         __debugbreak();
     }
 
+    /* FIXME: KDBG messes around with these improperly */
+#if !defined(KDBG)
     /* Check DR values */
     if (KiUserTrap(TrapFrame))
     {
@@ -175,8 +177,9 @@ KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame,
         CheckDr(1, Prcb->ProcessorState.SpecialRegisters.KernelDr1);
         CheckDr(2, Prcb->ProcessorState.SpecialRegisters.KernelDr2);
         CheckDr(3, Prcb->ProcessorState.SpecialRegisters.KernelDr3);
-        //CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7);
+        CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7);
     }
+#endif
 
     StopChecking = FALSE;
 }