diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
index a9f76de5c8..513d721747 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
@@ -90,6 +90,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
       throws IOException {
     checkState(token instanceof Track);
     ((Track) token).writeSampleData(byteBuf, bufferInfo);
+    doInterleave();
   }
 
   public void close() throws IOException {
@@ -387,7 +388,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
       }
 
       pendingSamples.addLast(Pair.create(bufferInfo, byteBuffer));
-      doInterleave();
     }
 
     @Override