diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt index df3d8e98b30..5b3f661c634 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt @@ -315,6 +315,11 @@ public object ReactScrollViewHelper { if (ViewUtil.getUIManagerType(scrollView.id) == UIManagerType.DEFAULT) { return } + // NOTE: if the state wrapper is null, we shouldn't even update + // the scroll state because there is a chance of going out of sync! + if (scrollView.stateWrapper == null) { + return + } val scrollState = scrollView.reactScrollViewScrollState // Dedupe events to reduce JNI traffic if (scrollState.lastStateUpdateScroll.equals(scrollX, scrollY)) {