diff --git a/embd_res/kcpp_musicui.embd b/embd_res/kcpp_musicui.embd
index 0d5710c4c..fadb267de 100644
--- a/embd_res/kcpp_musicui.embd
+++ b/embd_res/kcpp_musicui.embd
@@ -206,7 +206,7 @@ input[type="checkbox"] {
       <div><label>Steps</label><input id="inference_steps" type="number" value="8"></div>
       <div><label>Guidance</label><input id="guidance_scale" type="number" value="1"></div>
       <div><label>Shift</label><input id="shift" type="number" value="3"></div>
-      <div><label>Save as MP3</label><input id="use_mp3" type="checkbox" checked></div>
+      <div><label>Save as MP3</label><input id="use_mp3" type="checkbox"></div>
       <div><label>Stereo</label><input id="stereo" type="checkbox" checked></div>
       <div><label>Gen Codes</label><input id="gen_codes" type="checkbox"></div>
     </div>
@@ -460,12 +460,14 @@ function loadLibrary(){
         const div=document.createElement("div");
         div.className="library-item";
         const url=URL.createObjectURL(item.audio);
+        let ismp3 = (item.params?(item.params.use_mp3?true:false):false);
+        let savfmt = (ismp3?".mp3":".wav");
         div.innerHTML=`
           <h4>${item.title}</h4>
           <div class="meta">${new Date(item.date).toLocaleString()}</div>
           <audio controls src="${url}"></audio>
           <div style="margin-top:6px;display:flex;gap:6px;">
-            <a href="${url}" download="${item.title}.wav">
+            <a href="${url}" download="${item.title}${savfmt}">
                 <button class="secondary">Download</button>
             </a>
             <button class="secondary" onclick="loadTrackJSON(${item.id})">
diff --git a/koboldcpp.py b/koboldcpp.py
index 1e1029740..4ba4c61da 100755
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -2486,7 +2486,7 @@ def music_generate_codes(genparams):
     inputs = music_generation_inputs()
     inputs.is_planner_mode = True
     inputs.stereo = genparams.get('stereo', True)
-    inputs.use_mp3 = genparams.get('use_mp3', True)
+    inputs.use_mp3 = genparams.get('use_mp3', False)
     inputs.gen_codes =  genparams.get('gen_codes', False)
     inputs.rewrite_caption =  genparams.get('rewrite_caption', True)
     inputs.input_json = input_json.encode("UTF-8")
@@ -2503,7 +2503,7 @@ def music_generate_audio(genparams):
     inputs = music_generation_inputs()
     inputs.is_planner_mode = False
     inputs.stereo = genparams.get('stereo', True)
-    inputs.use_mp3 = genparams.get('use_mp3', True)
+    inputs.use_mp3 = genparams.get('use_mp3', False)
     inputs.gen_codes =  genparams.get('gen_codes', False)
     inputs.rewrite_caption =  genparams.get('rewrite_caption', True)
     inputs.input_json = input_json.encode("UTF-8")
diff --git a/otherarch/acestep/dit-vae.cpp b/otherarch/acestep/dit-vae.cpp
index 2e4b3e1dd..0c9e6f98f 100644
--- a/otherarch/acestep/dit-vae.cpp
+++ b/otherarch/acestep/dit-vae.cpp
@@ -980,7 +980,7 @@ std::string acestep_generate_audio(const music_generation_inputs inputs)
     float muslen = (float)T_audio / 48000.0f;
     std::string finalb64;
     if (inputs.use_mp3) {
-        fprintf(stderr, "[Save Audio] Converting to Mp3...\n",muslen);
+        fprintf(stderr, "[Save Audio] Converting to Mp3 (CPU based, may be slow, use .wav if too slow)...\n",muslen);
         finalb64 = save_stereo_mp3_base64(audio, T_audio, 48000);
     } else if (inputs.stereo) {
          fprintf(stderr, "[Save Audio] Save as Stereo WAV...\n",muslen);