diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index 3310d94e85f..99bbf5b03fb 100644
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -337,6 +337,11 @@ NtSetDebugFilterState(IN ULONG ComponentId,
 		KdComponentTable[i].ComponentId = ComponentId;
 		KdComponentTable[i].Level = 0;
 	}
+
+    /* Convert level to mask, if needed */
+    if (Level < 32)
+        Level = 1 << Level;
+
 	if ( State )
 		KdComponentTable[i].Level |= Level;
 	else