diff --git a/Libraries/Text/RCTShadowText.m b/Libraries/Text/RCTShadowText.m
index 4201b1b4e..4ea9d3bd6 100644
--- a/Libraries/Text/RCTShadowText.m
+++ b/Libraries/Text/RCTShadowText.m
@@ -22,15 +22,21 @@ static css_dim_t RCTMeasure(void *context, float width)
   RCTShadowText *shadowText = (__bridge RCTShadowText *)context;
 
   NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:[shadowText attributedString]];
+  NSTextStorage *previousTextStorage = shadowText.layoutManager.textStorage;
+  if (previousTextStorage) {
+    [previousTextStorage removeLayoutManager:shadowText.layoutManager];
+  }
   [textStorage addLayoutManager:shadowText.layoutManager];
 
   shadowText.textContainer.size = CGSizeMake(isnan(width) ? CGFLOAT_MAX : width, CGFLOAT_MAX);
-  shadowText.layoutManager.textStorage = textStorage;
   [shadowText.layoutManager ensureLayoutForTextContainer:shadowText.textContainer];
 
   CGSize computedSize = [shadowText.layoutManager usedRectForTextContainer:shadowText.textContainer].size;
 
   [textStorage removeLayoutManager:shadowText.layoutManager];
+  if (previousTextStorage) {
+    [previousTextStorage addLayoutManager:shadowText.layoutManager];
+  }
 
   css_dim_t result;
   result.dimensions[CSS_WIDTH] = RCTCeilPixelValue(computedSize.width);
diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m
index b8dabcf2c..e5e9ad00a 100644
--- a/Libraries/Text/RCTTextManager.m
+++ b/Libraries/Text/RCTTextManager.m
@@ -46,7 +46,7 @@ RCT_EXPORT_SHADOW_PROPERTY(fontWeight, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(fontStyle, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(isHighlighted, BOOL)
 RCT_EXPORT_SHADOW_PROPERTY(lineHeight, CGFloat)
-RCT_EXPORT_SHADOW_PROPERTY(maxNumberOfLines, NSInteger)
+RCT_EXPORT_SHADOW_PROPERTY(maximumNumberOfLines, NSInteger)
 RCT_EXPORT_SHADOW_PROPERTY(shadowOffset, CGSize)
 RCT_EXPORT_SHADOW_PROPERTY(textAlign, NSTextAlignment)
 RCT_REMAP_SHADOW_PROPERTY(backgroundColor, textBackgroundColor, UIColor)