diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index e6ef83137fb..fffdf27704b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -665,7 +665,7 @@ public class ReactScrollView extends ScrollView implements ReactClippingViewGrou @Override protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { - if (mScroller != null) { + if (mScroller != null && mContentView != null) { // FB SCROLLVIEW CHANGE // This is part two of the reimplementation of fling to fix the bounce-back bug. See #fling() for