diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
index d209f590c..298e6c999 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
@@ -13,13 +13,13 @@ void ComponentDescriptorRegistry::registerComponentDescriptor(SharedComponentDes
   _registryByName[componentName] = componentDescriptor;
 }
 
-const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const SharedShadowNode &shadowNode) {
+const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const SharedShadowNode &shadowNode) const {
   ComponentHandle componentHandle = shadowNode->getComponentHandle();
-  return _registryByHandle[componentHandle];
+  return _registryByHandle.at(componentHandle);
 }
 
-const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const ComponentName &componentName) {
-  return _registryByName[componentName];
+const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const ComponentName &componentName) const {
+  return _registryByName.at(componentName);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
index 462ab9f7f..57d03d524 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
@@ -9,6 +9,10 @@
 namespace facebook {
 namespace react {
 
+class ComponentDescriptorRegistry;
+
+using SharedComponentDescriptorRegistry = std::shared_ptr<const ComponentDescriptorRegistry>;
+
 /*
  * Registry of particular `ComponentDescriptor`s.
  */
@@ -17,8 +21,8 @@ class ComponentDescriptorRegistry {
 public:
   void registerComponentDescriptor(SharedComponentDescriptor componentDescriptor);
 
-  const SharedComponentDescriptor operator[](const SharedShadowNode &shadowNode);
-  const SharedComponentDescriptor operator[](const ComponentName &componentName);
+  const SharedComponentDescriptor operator[](const SharedShadowNode &shadowNode) const;
+  const SharedComponentDescriptor operator[](const ComponentName &componentName) const;
 
 private:
   std::unordered_map<ComponentHandle, SharedComponentDescriptor> _registryByHandle;