diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
index d4a8d78e228851..67ce4f12989124 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
@@ -38,6 +38,8 @@ void RawPropsKeyMap::insert(
   item.value = value;
   key.render(item.name, &item.length);
   items_.push_back(item);
+  react_native_assert(
+      items_.size() < std::numeric_limits<RawPropsPropNameLength>::max());
 }
 
 void RawPropsKeyMap::reindex() noexcept {
diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp
index d78f83ce125da9..5e6f72f0c786ea 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp
@@ -42,6 +42,7 @@ RawValue const *RawPropsParser::at(
     // This is not thread-safe part; this happens only during initialization of
     // a `ComponentDescriptor` where it is actually safe.
     keys_.push_back(key);
+    react_native_assert(size < std::numeric_limits<RawPropsValueIndex>::max());
     nameToIndex_.insert(key, static_cast<RawPropsValueIndex>(size));
     return nullptr;
   }
diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h
index 18fac05b91b607..dfd75a8f9b7400 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h
@@ -15,11 +15,11 @@ namespace facebook::react {
 /*
  * Type used to represent an index of some stored values in small arrays.
  */
-using RawPropsValueIndex = uint8_t;
+using RawPropsValueIndex = uint16_t;
 static_assert(
-    sizeof(RawPropsValueIndex) == 1,
-    "RawPropsValueIndex must be one byte size.");
-using RawPropsPropNameLength = uint8_t;
+    sizeof(RawPropsValueIndex) == 2,
+    "RawPropsValueIndex must be two byte size.");
+using RawPropsPropNameLength = uint16_t;
 using RawPropsPropNameHash = uint32_t;
 
 /*