diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6e70a55..3d94d8e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -745,12 +745,15 @@
                 duration, LINEAR, anim);
     }
 
-    private void removeTask(Task task, PendingAnimation.OnEndListener onEndListener) {
+    private void removeTask(Task task, PendingAnimation.OnEndListener onEndListener,
+            boolean shouldLog) {
         if (task != null) {
             ActivityManagerWrapper.getInstance().removeTask(task.key.id);
-            mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
-                    onEndListener.logAction, Direction.UP,
-                    TaskUtils.getComponentKeyForTask(task.key));
+            if (shouldLog) {
+                mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
+                        onEndListener.logAction, Direction.UP,
+                        TaskUtils.getComponentKeyForTask(task.key));
+            }
         }
     }
 
@@ -833,7 +836,7 @@
         mPendingAnimation.addEndListener((onEndListener) -> {
            if (onEndListener.isSuccess) {
                if (shouldRemoveTask) {
-                   removeTask(taskView.getTask(), onEndListener);
+                   removeTask(taskView.getTask(), onEndListener, true);
                }
                int pageToSnapTo = mCurrentPage;
                if (draggedIndex < pageToSnapTo) {
@@ -869,7 +872,7 @@
             if (onEndListener.isSuccess) {
                 while (getChildCount() != 0) {
                     TaskView taskView = getPageAt(getChildCount() - 1);
-                    removeTask(taskView.getTask(), onEndListener);
+                    removeTask(taskView.getTask(), onEndListener, false);
                     removeView(taskView);
                 }
                 onAllTasksRemoved();
