diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index 4b64720d80e..76176981b55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -46,6 +46,7 @@ public class TextLayoutManager {
   private static final String INLINE_VIEW_PLACEHOLDER = "0";
 
   private static final Object sSpannableCacheLock = new Object();
+  private static final boolean DEFAULT_INCLUDE_FONT_PADDING = true;
   private static LruCache<String, Spannable> sSpannableCache = new LruCache<>(spannableCacheSize);
 
   public static boolean isRTL(ReadableMap attributedString) {
@@ -221,7 +222,10 @@ public class TextLayoutManager {
 
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
-    boolean includeFontPadding = true;
+    boolean includeFontPadding =
+        paragraphAttributes.hasKey("includeFontPadding")
+            ? paragraphAttributes.getBoolean("includeFontPadding")
+            : DEFAULT_INCLUDE_FONT_PADDING;
 
     if (preparedSpannableText == null) {
       throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
diff --git a/ReactCommon/fabric/attributedstring/conversions.h b/ReactCommon/fabric/attributedstring/conversions.h
index e92f06ace4b..774913dcd32 100644
--- a/ReactCommon/fabric/attributedstring/conversions.h
+++ b/ReactCommon/fabric/attributedstring/conversions.h
@@ -448,6 +448,11 @@ inline ParagraphAttributes convertRawProp(
       "maximumFontSize",
       sourceParagraphAttributes.maximumFontSize,
       defaultParagraphAttributes.maximumFontSize);
+  paragraphAttributes.includeFontPadding = convertRawProp(
+      rawProps,
+      "includeFontPadding",
+      sourceParagraphAttributes.includeFontPadding,
+      defaultParagraphAttributes.includeFontPadding);
 
   return paragraphAttributes;
 }
@@ -481,6 +486,8 @@ inline folly::dynamic toDynamic(
   values("ellipsizeMode", toString(paragraphAttributes.ellipsizeMode));
   values("textBreakStrategy", toString(paragraphAttributes.textBreakStrategy));
   values("adjustsFontSizeToFit", paragraphAttributes.adjustsFontSizeToFit);
+  values("includeFontPadding", paragraphAttributes.includeFontPadding);
+
   return values;
 }