@@ -106,8 +106,10 @@ @implementation RCTScrollViewComponentView {
 
   CGPoint _contentOffsetWhenClipped;
 
+  // Set in `finalizeUpdates:`, when the content size and direction are known.
   std::optional<CGPoint> _pendingContentOffset;
-  BOOL _contentOffsetNeedsUpdate;
+  BOOL _isPendingContentOffsetFromState;
+  BOOL _contentOffsetNeedsStateUpdate;
 
   __weak UIView *_contentView;
 
@@ -309,12 +311,13 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
 {
   if (layoutMetrics.layoutDirection != oldLayoutMetrics.layoutDirection && !_pendingContentOffset) {
-    _pendingContentOffset = [self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset];
+    _pendingContentOffset = [self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset forState:YES];
+    _isPendingContentOffsetFromState = YES;
   }
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
   if (layoutMetrics.layoutDirection == LayoutDirection::RightToLeft &&
       layoutMetrics.frame.size.width != oldLayoutMetrics.frame.size.width) {
-    _contentOffsetNeedsUpdate = YES;
+    _contentOffsetNeedsStateUpdate = YES;
   }
   if (layoutMetrics.layoutDirection != oldLayoutMetrics.layoutDirection) {
     CGAffineTransform transform = (layoutMetrics.layoutDirection == LayoutDirection::LeftToRight)
@@ -418,6 +421,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
   if (oldProps ? oldScrollViewProps.contentOffset != newScrollViewProps.contentOffset
                : newScrollViewProps.contentOffset != facebook::react::Point{}) {
     _pendingContentOffset = RCTCGPointFromPoint(newScrollViewProps.contentOffset);
+    _isPendingContentOffsetFromState = NO;
   }
 
   // RCTEnhancedScrollView specific props
@@ -477,29 +481,11 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &
   _state = std::static_pointer_cast<const ScrollViewShadowNode::ConcreteState>(state);
   auto &data = _state->getData();
 
-  auto contentOffset = RCTCGPointFromPoint(data.contentOffset);
   if (!oldState) {
-    /*
-     * When <ScrollView /> is suspended, it is removed from view hierarchy and its offset is stored in
-     * state. We want to restore this offset from the state but it must be snapped to be within UIScrollView's
-     * content to remove any overscroll.
-     *
-     * This can happen, for example, with pull to refresh. The UIScrollView will be overscrolled into negative offset.
-     * If the offset is not adjusted to be within the content area, it leads to a gap and UIScrollView does not adjust
-     * its offset until user scrolls.
-     */
-
-    // Adjusting overscroll on the top.
-    contentOffset.y = fmax(contentOffset.y, -_scrollView.contentInset.top);
-
-    // Adjusting overscroll on the left.
-    contentOffset.x = fmax(contentOffset.x, -_scrollView.contentInset.left);
-
-    // TODO: T190695447 - Protect against over scroll on the bottom and right as well.
-    // This is not easily done because we need to flip the order of method calls for
-    // ShadowViewMutation::Insert. updateLayout must come before updateState.
-
-    _pendingContentOffset = contentOffset;
+    // When <ScrollView /> is suspended, it is removed from view hierarchy and its offset is stored in state.
+    // `finalizeUpdates:` restores it.
+    _pendingContentOffset = RCTCGPointFromPoint(data.contentOffset);
+    _isPendingContentOffsetFromState = YES;
   }
 
   CGSize contentSize = RCTCGSizeFromSize(data.getContentSize());
@@ -509,7 +495,7 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &
   }
 
   if (_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft && contentSize.width != _contentSize.width) {
-    _contentOffsetNeedsUpdate = YES;
+    _contentOffsetNeedsStateUpdate = YES;
   }
   _contentSize = contentSize;
   _containerView.frame = CGRect{RCTCGPointFromPoint(data.contentBoundingRect.origin), contentSize};
@@ -524,17 +510,25 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
   [super finalizeUpdates:updateMask];
 
   if (_pendingContentOffset) {
-    CGPoint contentOffset = [self _mirrorContentOffsetIfNeeded:*_pendingContentOffset];
+    CGPoint contentOffset = [self _mirrorContentOffsetIfNeeded:*_pendingContentOffset
+                                                      forState:_isPendingContentOffsetFromState];
+    if (_isPendingContentOffsetFromState) {
+      // Snap a restored offset into the content to remove any overscroll, for example after pull to refresh.
+      // TODO: T190695447 - Protect against over scroll on the bottom and right as well.
+      contentOffset.x = fmax(contentOffset.x, -_scrollView.contentInset.left);
+      contentOffset.y = fmax(contentOffset.y, -_scrollView.contentInset.top);
+    }
     _pendingContentOffset.reset();
     if (!CGPointEqualToPoint(_scrollView.contentOffset, contentOffset)) {
+      // `scrollViewDidScroll:` updates the state.
       _scrollView.contentOffset = contentOffset;
-      _contentOffsetNeedsUpdate = NO;
+      _contentOffsetNeedsStateUpdate = NO;
     }
   }
 
-  if (_contentOffsetNeedsUpdate) {
-    _contentOffsetNeedsUpdate = NO;
-    [self scrollViewDidScroll:_scrollView];
+  if (_contentOffsetNeedsStateUpdate) {
+    _contentOffsetNeedsStateUpdate = NO;
+    [self _updateStateWithContentOffset];
   }
 }
 
@@ -624,11 +618,16 @@ - (BOOL)_shouldDisableScrollInteraction
   return NO;
 }
 
-// In RTL, UIKit offsets start on the right, but JS and state offsets start on the left.
-- (CGPoint)_mirrorContentOffsetIfNeeded:(CGPoint)offset
+/*
+ * In RTL, UIKit offsets start on the right, but JS and state offsets start on the left.
+ * When the content is narrower than the view, the JS offset is 0, like on Android.
+ * The state offset is negative, because the shadow tree puts the content on the left.
+ */
+- (CGPoint)_mirrorContentOffsetIfNeeded:(CGPoint)offset forState:(BOOL)forState
 {
   if (_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
-    offset.x = MAX(_scrollView.contentSize.width - _scrollView.bounds.size.width, 0) - offset.x;
+    CGFloat maxOffset = _scrollView.contentSize.width - _scrollView.bounds.size.width;
+    offset.x = (forState ? maxOffset : MAX(maxOffset, 0)) - offset.x;
   }
   return offset;
 }
@@ -637,7 +636,8 @@ - (CGPoint)_mirrorContentOffsetIfNeeded:(CGPoint)offset
 {
   auto metrics = ScrollViewEventEmitter::Metrics{};
   metrics.contentSize = RCTSizeFromCGSize(_scrollView.contentSize);
-  metrics.contentOffset = RCTPointFromCGPoint([self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset]);
+  metrics.contentOffset = RCTPointFromCGPoint([self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset
+                                                                        forState:NO]);
   metrics.contentInset = RCTEdgeInsetsFromUIEdgeInsets(_scrollView.contentInset);
   metrics.containerSize = RCTSizeFromCGSize(_scrollView.bounds.size);
   metrics.zoomScale = _scrollView.zoomScale;
@@ -700,7 +700,7 @@ - (void)_updateStateWithContentOffset
 
   _avoidAdjustmentForMaintainVisibleContentPosition = enableImmediateUpdateModeForContentOffsetChanges;
 
-  auto contentOffset = RCTPointFromCGPoint([self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset]);
+  auto contentOffset = RCTPointFromCGPoint([self _mirrorContentOffsetIfNeeded:_scrollView.contentOffset forState:YES]);
   BOOL isAccessibilityAPIUsed = _isAccessibilityAPIUsed;
   _state->updateState(
       [contentOffset, isAccessibilityAPIUsed](
@@ -735,7 +735,7 @@ - (void)prepareForRecycle
   _scrollView.zoomScale = 1.0;
   _scrollView.contentOffset = CGPointZero;
   _pendingContentOffset.reset();
-  _contentOffsetNeedsUpdate = NO;
+  _contentOffsetNeedsStateUpdate = NO;
   // Invalidate cached content size so that updateState: recalculates the
   // container frame after zoomScale reset (which may have mutated it in RTL).
   _contentSize = CGSizeZero;
@@ -1064,7 +1064,7 @@ - (void)scrollToOffset:(CGPoint)offset
 
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
-  offset = [self _mirrorContentOffsetIfNeeded:offset];
+  offset = [self _mirrorContentOffsetIfNeeded:offset forState:NO];
 
   if (CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
     return;
 
@@ -10,8 +10,6 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/LayoutMetrics.h>
 
-#include <algorithm>
-
 namespace facebook::react {
 
 // NOLINTNEXTLINE(facebook-hte-CArray)
@@ -29,14 +27,15 @@ void ScrollViewShadowNode::updateStateIfNeeded() {
 
   if (state.contentBoundingRect != contentBoundingRect) {
     state.contentBoundingRect = contentBoundingRect;
+#ifndef ANDROID
     // RTL scroll views start on the right until the native view reports.
     if (getState()->getRevision() == State::initialRevisionValue &&
         getLayoutMetrics().layoutDirection == LayoutDirection::RightToLeft &&
         state.contentOffset.x == 0) {
-      state.contentOffset.x = std::max<Float>(
-          0,
-          contentBoundingRect.size.width - getLayoutMetrics().frame.size.width);
+      state.contentOffset.x =
+          contentBoundingRect.size.width - getLayoutMetrics().frame.size.width;
     }
+#endif
     setStateData(std::move(state));
   }
 }
 
@@ -46,6 +46,18 @@ CullingContext CullingContext::adjustCullingContextIfNeeded(
         }
 
         cullingContext.transform = Transform::Identity();
+
+#ifdef ANDROID
+        auto layoutMetrics = scrollViewShadowNode->getLayoutMetrics();
+        if (layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
+          // In RTL, content offset is flipped horizontally.
+          // We need to flip the culling context frame to match.
+          auto stateData = scrollViewShadowNode->getStateData();
+          cullingContext.frame.origin.x =
+              stateData.contentBoundingRect.size.width -
+              layoutMetrics.frame.size.width - cullingContext.frame.origin.x;
+        }
+#endif
       } else {
         cullingContext = {};
       }