diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
index 68cbd7a..808cd72 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -224,6 +224,9 @@
 
     @Override
     public void endAnimations() {
+        if (!isRunning()) {
+            return;
+        }
         for (int i = mPendingAnims.size() - 1; i >= 0; i--) {
             endPendingAnimation(mPendingAnims.get(i));
             mPendingAnims.remove(i);
@@ -233,7 +236,7 @@
             // This calls the on end animation callback which will set values to their end target.
             anim.cancel();
         }
-        dispatchAnimationsFinished();
+        dispatchFinishedWhenDone();
     }
 
     private void endPendingAnimation(PendingAnimation pendAnim) {