diff --git a/platform/platform-resources/src/componentSets/PlatformComponents.xml b/platform/platform-resources/src/componentSets/PlatformComponents.xml
index 8913d4536489..51b1d2960dc1 100644
--- a/platform/platform-resources/src/componentSets/PlatformComponents.xml
+++ b/platform/platform-resources/src/componentSets/PlatformComponents.xml
@@ -8,6 +8,9 @@
     <component>
       <implementation-class>com.intellij.openapi.components.impl.ServiceManagerImpl</implementation-class>
     </component>
+    <component>
+      <implementation-class>com.intellij.openapi.util.registry.RegistryState</implementation-class>
+    </component>
     <component>
       <interface-class>com.intellij.openapi.project.impl.ProjectStoreClassProvider</interface-class>
       <implementation-class>com.intellij.openapi.components.impl.stores.PlatformProjectStoreClassProvider</implementation-class>
diff --git a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
index 8b66914a36fd..31eee9d568f8 100644
--- a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
+++ b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
@@ -8,6 +8,9 @@
     <component>
       <implementation-class>com.intellij.openapi.components.impl.ServiceManagerImpl</implementation-class>
     </component>
+    <component>
+      <implementation-class>com.intellij.openapi.util.registry.RegistryState</implementation-class>
+    </component>
     <component>
       <interface-class>com.intellij.openapi.project.impl.ProjectStoreClassProvider</interface-class>
       <implementation-class>com.intellij.openapi.components.impl.stores.PlatformLangProjectStoreClassProvider</implementation-class>