diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 584f7bf5e5b16..a902ca913773a 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -2046,9 +2046,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
 
         if (shouldStartChangeTransition(mTmpPrevBounds)) {
             initializeChangeTransition(mTmpPrevBounds);
-        }
-
-        if (mTaskFragmentOrganizer != null) {
+        } else if (mTaskFragmentOrganizer != null) {
             // Update the surface position here instead of in the organizer so that we can make sure
             // it can be synced with the surface freezer.
             updateSurfacePosition(getSyncTransaction());