diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c
index 1d03d07e2d0..58c17e79bed 100644
--- a/base/setup/lib/bootsup.c
+++ b/base/setup/lib/bootsup.c
@@ -126,21 +126,20 @@ CreateFreeLoaderReactOSEntries(
 #endif
 
 
-#if DBG
+    /* DefaultOS=ReactOS */
+#if DBG && !defined(_WINKD_)
     if (IsUnattendedSetup)
     {
-        /* DefaultOS=ReactOS */
-#ifndef _WINKD_
         BootOptions.CurrentBootEntryKey = MAKESTRKEY(L"ReactOS_KdSerial");
-#else
-        BootOptions.CurrentBootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
-#endif
     }
     else
 #endif
     {
-        /* DefaultOS=ReactOS */
+#if DBG
+        BootOptions.CurrentBootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
+#else
         BootOptions.CurrentBootEntryKey = MAKESTRKEY(L"ReactOS");
+#endif
     }
 
 #if DBG