diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt
index c9f791c6ee..1d0077fd8c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt
@@ -210,7 +210,7 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) :
         )
 
         builder.addEndListener { success: Boolean ->
-            if (!success && !toState.isRecentsViewVisible) {
+            if (!success && fromState.isRecentsViewVisible && !toState.isRecentsViewVisible) {
                 recentsView.reset()
             }
         }
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 7db1813a90..a4c0d0328c 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -87,7 +87,8 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
         // While animating into recents, update the visible task data as needed
         setter.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));
         setter.addEndListener(success -> {
-            if (!success && !toState.isRecentsViewVisible()) {
+            if (!success && mRecentsViewContainer.isRecentsViewVisible()
+                    && !toState.isRecentsViewVisible()) {
                 mRecentsView.reset();
             }
         });
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index dc1cdde4bc..dcd7089d13 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -287,7 +287,7 @@ public class FallbackRecentsView<CONTAINER_TYPE extends Context & RecentsViewCon
                 setOverviewGridEnabled(false);
             }
         }
-        if (!finalState.isRecentsViewVisible()) {
+        if (mContainer.isRecentsViewVisible() && !finalState.isRecentsViewVisible()) {
             // Clean-up logic that occurs when recents is no longer in use/visible.
             reset();
         }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index b86d0c85de..6ddba80126 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -184,7 +184,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
             }
         }
 
-        if (!finalState.isRecentsViewVisible) {
+        if (mContainer.isRecentsViewVisible() && !finalState.isRecentsViewVisible) {
             // Clean-up logic that occurs when recents is no longer in use/visible.
             reset();
         }