diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
index 49123ff87..e04cce3f7 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
@@ -141,6 +141,7 @@ class MetadataStripper {
             val tempOutputFile = File.createTempFile("stripped_video_", ".mp4", context.cacheDir)
 
             val extractor = MediaExtractor()
+            var succeeded = false
             var muxer: MediaMuxer? = null
             var muxerStarted = false
             try {
@@ -184,11 +185,13 @@ class MetadataStripper {
 
                 muxer.stop()
                 muxerStarted = false
+                succeeded = true
             } finally {
                 if (muxerStarted) runCatching { muxer?.stop() }
                 muxer?.release()
                 extractor.release()
                 tempInputFile.delete()
+                if (!succeeded) tempOutputFile.delete()
             }
 
             Log.d("MetadataStripper", "Stripped metadata from video")