diff --git a/src/styles/index.ts b/src/styles/index.ts
index 68378e807480c..15d3d11bb3e74 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -2103,6 +2103,13 @@ const staticStyles = (theme: ThemeColors) =>
                 paddingBottom: 0,
                 alignSelf: 'center',
                 verticalAlign: 'middle',
+                ...(Platform.OS === 'android' && {
+                    height: undefined,
+                    lineHeight: undefined,
+                    alignSelf: 'stretch',
+                    flexGrow: 1,
+                    flexShrink: 1,
+                }),
             },
             0,
         ),
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 10de277f10f14..86b75b473aa6d 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1873,7 +1873,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
             return {};
         }
 
-        const composerLineHeight = styles.textInputCompose.lineHeight ?? 0;
+        const composerLineHeight = variables.lineHeightXLarge ?? 0;
 
         return {
             maxHeight: maxLines * composerLineHeight,