diff --git a/modules/react-native-ui-text-view/ios/RNUITextViewChildShadow.swift b/modules/react-native-ui-text-view/ios/RNUITextViewChildShadow.swift
index 0d7dae5038..09119a369b 100644
--- a/modules/react-native-ui-text-view/ios/RNUITextViewChildShadow.swift
+++ b/modules/react-native-ui-text-view/ios/RNUITextViewChildShadow.swift
@@ -15,6 +15,16 @@ class RNUITextViewChildShadow: RCTShadowView {
     return true
   }
 
+  override func didSetProps(_ changedProps: [String]!) {
+    guard let superview = self.superview as? RNUITextViewShadow else {
+      return
+    }
+
+    if !YGNodeIsDirty(superview.yogaNode) {
+      superview.setAttributedText()
+    }
+  }
+
   func getFontWeight() -> UIFont.Weight {
     switch self.fontWeight {
     case "bold":
diff --git a/modules/react-native-ui-text-view/ios/RNUITextViewShadow.swift b/modules/react-native-ui-text-view/ios/RNUITextViewShadow.swift
index 4fcf3a0f50..4862a2c3fc 100644
--- a/modules/react-native-ui-text-view/ios/RNUITextViewShadow.swift
+++ b/modules/react-native-ui-text-view/ios/RNUITextViewShadow.swift
@@ -1,11 +1,19 @@
 class RNUITextViewShadow: RCTShadowView {
   // Props
-  @objc var numberOfLines: Int = 0
+  @objc var numberOfLines: Int = 0 {
+    didSet {
+      if !YGNodeIsDirty(self.yogaNode) {
+        self.setAttributedText()
+      }
+    }
+  }
   @objc var allowsFontScaling: Bool = true
 
   var attributedText: NSAttributedString = NSAttributedString()
   var frameSize: CGSize = CGSize()
 
+  var lineHeight: CGFloat = 0
+
   var bridge: RCTBridge
 
   init(bridge: RCTBridge) {
@@ -104,31 +112,20 @@ class RNUITextViewShadow: RCTShadowView {
         range: NSMakeRange(0, string.length)
       )
 
+      self.lineHeight = child.lineHeight
+
       finalAttributedString.append(string)
     }
 
     self.attributedText = finalAttributedString
+    self.dirtyLayout()
   }
 
   // Create a YGSize based on the max width
   func getNeededSize(maxWidth: Float) -> YGSize {
-
-    // Create a temporary textview
-    let textView = UITextView()
-    textView.attributedText = self.attributedText
-    textView.textContainer.lineFragmentPadding = 0
-    textView.textContainer.maximumNumberOfLines = self.numberOfLines
-    textView.textContainerInset = .zero
-    textView.isScrollEnabled = false
-
-    // Get the max size for sizeThatFits
     let maxSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(MAXFLOAT))
-
-    // Get the max height
-    let height = textView.sizeThatFits(maxSize).height
-
-    // Save the frame size and return the YGSize
-    self.frameSize = CGSize(width: CGFloat(maxWidth), height: height)
-    return YGSize(width: Float(maxWidth), height: Float(height))
+    let textSize = self.attributedText.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, context: nil)
+    self.frameSize = textSize.size
+    return YGSize(width: Float(textSize.width), height: Float(textSize.height))
   }
 }