diff --git a/libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java b/libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
index f7176f0f80..d9c48f3b57 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
@@ -461,14 +461,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       defaultShaderProgram = null;
       outputSurfaceInfoChanged = false;
     }
+
     if (defaultShaderProgram == null) {
       defaultShaderProgram =
           createDefaultShaderProgram(
               outputSurfaceInfo == null ? 0 : outputSurfaceInfo.orientationDegrees,
               outputWidth,
               outputHeight);
+      outputSurfaceInfoChanged = false;
     }
-
     return true;
   }