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 57b401cd6fbf5c..d89841d080145e 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
@@ -194,6 +194,8 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
         NativeGestureUtil.notifyNativeGestureStarted(this, ev);
         ReactScrollViewHelper.emitScrollBeginDragEvent(this);
         mDragging = true;
+        mFlinging = false;
+        mDoneFlinging = false;
         enableFpsListener();
         return true;
       }
@@ -300,6 +302,11 @@ public void fling(int velocityY) {
       Runnable r = new Runnable() {
         @Override
         public void run() {
+          // It's possible the fling was interrupted by the user.
+          if (!mFlinging) {
+            return;
+          }
+
           if (mDoneFlinging) {
             mFlinging = false;
             disableFpsListener();