diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
index 87ae695..9b4ab8e 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -235,6 +235,9 @@
 
     @Override
     public void endAnimations() {
+        if (!isRunning()) {
+            return;
+        }
         for (int i = mPendingAnims.size() - 1; i >= 0; i--) {
             PendingAnimation pendAnim = mPendingAnims.get(i);
             ViewHolder item = pendAnim.viewHolder;
@@ -254,7 +257,7 @@
             ObjectAnimator anim = mRunningAnims.get(i);
             anim.end();
         }
-        dispatchAnimationsFinished();
+        dispatchFinishedWhenDone();
     }
 
     @Override