diff --git a/apps/playback.c b/apps/playback.c
index b7078441c2..90a5e4384b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1565,6 +1565,7 @@ static int audio_check_new_track(void)
 
     /* Move to the new track */
     track_ridx = (track_ridx + ci.new_track) & MAX_TRACK_MASK;
+    buf_set_base_handle(CUR_TI->audio_hid);
 
 
     if (automatic_skip)
@@ -1723,6 +1724,7 @@ static void audio_play_start(size_t offset)
 
     sound_set_volume(global_settings.volume);
     track_widx = track_ridx = 0;
+    buf_set_base_handle(-1);
 
     /* Clear all track entries. */
     for (i = 0; i < MAX_TRACK; i++) {