diff --git a/api/src/stream/types.js b/api/src/stream/types.js
index 1af8459f..d1b86da5 100644
--- a/api/src/stream/types.js
+++ b/api/src/stream/types.js
@@ -128,7 +128,8 @@ const merge = async (streamInfo, res) => {
         if (streamInfo.subtitles) {
             args.push(
                 '-i', streamInfo.subtitles,
-                '-map', '2:s'
+                '-map', '2:s',
+                '-c:s', format === 'mp4' ? 'mov_text' : 'webvtt'
             );
         };
 
@@ -147,10 +148,6 @@ const merge = async (streamInfo, res) => {
             }
         }
 
-        if (streamInfo.subtitles && format === "mp4") {
-            args.push('-c:s', 'mov_text');
-        }
-
         if (streamInfo.metadata) {
             args = args.concat(convertMetadataToFFmpeg(streamInfo.metadata));
         }