diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList.js b/src/components/InvertedFlatList/BaseInvertedFlatList.js
index d3fcda0ea5fd..0bfffb733052 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList.js
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList.js
@@ -136,8 +136,6 @@ class BaseInvertedFlatList extends Component {
                 // Native platforms do not need to measure items and work fine without this.
                 // Web requires that items be measured or else crazy things happen when scrolling.
                 getItemLayout={this.props.shouldMeasureItems ? this.getItemLayout : undefined}
-                // We keep this property very low so that chat switching remains fast
-                maxToRenderPerBatch={1}
                 windowSize={15}
 
                 // Commenting the line below as it breaks the unread indicator test
diff --git a/src/components/InvertedFlatList/index.js b/src/components/InvertedFlatList/index.js
index 74409e9a0fe0..d46cd5801605 100644
--- a/src/components/InvertedFlatList/index.js
+++ b/src/components/InvertedFlatList/index.js
@@ -119,6 +119,9 @@ function InvertedFlatList(props) {
             shouldMeasureItems
             contentContainerStyle={StyleSheet.compose(contentContainerStyle, styles.justifyContentEnd)}
             onScroll={handleScroll}
+            // We need to keep batch size to one to workaround a bug in react-native-web.
+            // This can be removed once https://github.com/Expensify/App/pull/24482 is merged.
+            maxToRenderPerBatch={1}
         />
     );
 }