1 files changed, 6 insertions, 2 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 2f0895a590..6c37a9a71d 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -484,10 +484,14 @@ static int add_indices_to_playlist(struct playlist_info* playlist,
     {
         /* use mp3 buffer for maximum load speed */
         audio_stop();
+#if CONFIG_CODEC != SWCODEC
         talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
-
-        buffer = (char *)audiobuf;
         buflen = (audiobufend - audiobuf);
+        buffer = (char *)audiobuf;
+#else
+        buflen = (audiobufend - audiobuf - talk_get_bufsize());
+        buffer = (char *)&audiobuf[talk_get_bufsize()];
+#endif
     }
     
     store_index = true;