diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index dfd0e94763544..c3cc1e66db634 100644
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@@ -276,7 +276,7 @@ final public class MediaMuxer {
      */
     public void release() {
         if (mState == MUXER_STATE_STARTED) {
-            throw new IllegalStateException("Can't release when muxer is started");
+            stop();
         }
         if (mNativeObject != 0) {
             nativeRelease(mNativeObject);