diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1c2fa34b67..ebbad06441 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -508,7 +508,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     mRecentsView.onRecentsAnimationComplete();
                     if (mRecentsAnimationController != null) {
                         mRecentsAnimationController.cleanupScreenshot();
-                    } else if (mDeferredCleanupRecentsAnimationController != null) {
+                        mRecentsAnimationController = null;
+                    }
+                    if (mDeferredCleanupRecentsAnimationController != null) {
                         mDeferredCleanupRecentsAnimationController.cleanupScreenshot();
                         mDeferredCleanupRecentsAnimationController = null;
                     }
@@ -2140,7 +2142,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     @Override
     public void onRecentsAnimationFinished(RecentsAnimationController controller) {
-        mRecentsAnimationController = null;
         mRecentsAnimationTargets = null;
         if (mRecentsView != null) {
             mRecentsView.setRecentsAnimationTargets(null, null);