diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
index 4774bf25..32dc1c04 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
@@ -1174,14 +1174,20 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
                     request.addOption("--write-subs")
                 }
 
-                if (downloadItem.videoPreferences.embedSubs) {
-                    request.addOption("--embed-subs")
-                }
-
                 if(downloadItem.videoPreferences.writeAutoSubs){
                     request.addOption("--write-auto-subs")
                 }
 
+                if (downloadItem.videoPreferences.embedSubs) {
+                    if (sharedPreferences.getBoolean("write_subs_when_embed_subs", false) && !downloadItem.videoPreferences.writeSubs && !downloadItem.videoPreferences.writeAutoSubs) {
+                        request.addOption("--write-subs")
+                        request.addOption("--write-auto-subs")
+                        request.addOption("--compat-options", "no-keep-subs")
+                    }
+
+                    request.addOption("--embed-subs")
+                }
+
                 if (downloadItem.videoPreferences.embedSubs || downloadItem.videoPreferences.writeSubs || downloadItem.videoPreferences.writeAutoSubs){
                     val subFormat = sharedPreferences.getString("sub_format", "srt")
                     if(subFormat!!.isNotBlank()){
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd46f915..65cd6835 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -470,4 +470,6 @@
     <string name="automatic_backup">Automatic backup</string>
     <string name="backup_path">Backup Path</string>
     <string name="automatic_backup_summary">Automatically make a backup of everything when a new version the application is found</string>
+    <string name="write_subs_when_embed_subs">Write subtitles when embedding</string>
+    <string name="write_subs_when_embed_subs_summary">This will apply Save Subtitles and Save Automatic Subtitles to download the sub files and then delete them after embedding</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/processing_preferences.xml b/app/src/main/res/xml/processing_preferences.xml
index 2e095c1d..098e186f 100644
--- a/app/src/main/res/xml/processing_preferences.xml
+++ b/app/src/main/res/xml/processing_preferences.xml
@@ -185,6 +185,14 @@
             app:summary="@string/save_subs_desc"
             app:title="@string/save_auto_subs" />
 
+        <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preferece_material_switch"
+            app:defaultValue="true"
+            app:icon="@drawable/ic_subtitles"
+            app:key="write_subs_when_embed_subs"
+            app:summary="@string/write_subs_when_embed_subs_summary"
+            app:title="@string/write_subs_when_embed_subs" />
+
         <Preference
             android:icon="@drawable/baseline_subject_24"
             app:key="subs_lang"