diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c
index 4656fe85cdd..aa9b1f010be 100644
--- a/ntoskrnl/config/cmdata.c
+++ b/ntoskrnl/config/cmdata.c
@@ -60,7 +60,7 @@ BOOLEAN CmpShareSystemHives;
 BOOLEAN CmpMiniNTBoot;
 
 ULONG CmpBootType;
-BOOLEAN CmSelfHeal = TRUE;
+ULONG CmSelfHeal = TRUE;
 BOOLEAN CmpSelfHeal = TRUE;
 
 USHORT CmpUnknownBusCount;
@@ -666,6 +666,13 @@ DATA_SEG("INITDATA") CM_SYSTEM_CONTROL_VECTOR CmControlVector[] =
         &DummyData,
         &DummyData
     },
+    {
+        L"Session Manager\\Configuration Manager",
+        L"SelfHealingEnabled",
+        &CmSelfHeal,
+        NULL,
+        NULL
+    },
     {
         L"Session Manager",
         L"ForceNpxEmulation",
diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h
index f40d8420895..8d33736c482 100644
--- a/ntoskrnl/include/internal/cm.h
+++ b/ntoskrnl/include/internal/cm.h
@@ -1452,9 +1452,9 @@ extern HIVE_LIST_ENTRY CmpMachineHiveList[];
 extern UNICODE_STRING CmSymbolicLinkValueName;
 extern UNICODE_STRING CmpSystemStartOptions;
 extern UNICODE_STRING CmpLoadOptions;
-extern BOOLEAN CmSelfHeal;
-extern BOOLEAN CmpSelfHeal;
 extern ULONG CmpBootType;
+extern ULONG CmSelfHeal;
+extern BOOLEAN CmpSelfHeal;
 extern HANDLE CmpRegistryRootHandle;
 extern BOOLEAN ExpInTextModeSetup;
 extern BOOLEAN InitIsWinPEMode;