diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
index e95bdd7509d1b7..1de973515531f3 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
@@ -12,7 +12,7 @@ using namespace facebook::react;
 namespace facebook {
 namespace react {
 
-MapBuffer::MapBuffer(int initialSize) {
+MapBuffer::MapBuffer(uint16_t initialSize) {
   _dataSize = initialSize;
   _data = new Byte[_dataSize];
   // TODO: Should we clean up memory here?
@@ -20,6 +20,13 @@ MapBuffer::MapBuffer(int initialSize) {
 
 void MapBuffer::makeSpace() {
   int oldDataSize = _dataSize;
+  if (_dataSize >= std::numeric_limits<uint16_t>::max() / 2) {
+    LOG(ERROR)
+        << "Error: trying to assign a value beyond the capacity of uint16_t"
+        << static_cast<uint32_t>(_dataSize) * 2;
+    throw "Error: trying to assign a value beyond the capacity of uint16_t" +
+        std::to_string(static_cast<uint32_t>(_dataSize) * 2);
+  }
   _dataSize *= 2;
   uint8_t *_newdata = new Byte[_dataSize];
   uint8_t *_oldData = _data;
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
index a56074737d6998..e6c8d4a2673a23 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
@@ -13,7 +13,7 @@ namespace facebook {
 namespace react {
 
 // 506 = 5 entries = 50*10 + 6 sizeof(header)
-const int INITIAL_SIZE = 506;
+constexpr uint16_t INITIAL_SIZE = 506;
 
 /**
  * MapBuffer is an optimized map format for transferring data like props between
@@ -46,7 +46,7 @@ class MapBuffer {
  public:
   MapBuffer() : MapBuffer(INITIAL_SIZE) {}
 
-  MapBuffer(int initialSize);
+  MapBuffer(uint16_t initialSize);
 
   ~MapBuffer();