diff --git a/FW/leo_muziekdoos_esp32/src/audio.cpp b/FW/leo_muziekdoos_esp32/src/audio.cpp
index 09d58c4..e64b68f 100644
--- a/FW/leo_muziekdoos_esp32/src/audio.cpp
+++ b/FW/leo_muziekdoos_esp32/src/audio.cpp
@@ -6,7 +6,7 @@ AudioFileSourceLittleFS *file;
 AudioOutputI2S *out;
 
 uint8_t audio_current_Song = 0;
-const char *nextAudioFile = "";
+String nextAudioFile = "";
 uint8_t n = 0;
 
 bool audioState = false;
@@ -72,6 +72,7 @@ void playSong(String filename)
 {
   if (filename != "")
   {
+    nextAudioFile = filename;
     log_i("now playing %s\n", filename.c_str());
     file = new AudioFileSourceLittleFS(filename.c_str());
     id3 = new AudioFileSourceID3(file);
@@ -134,7 +135,7 @@ void handleAudio()
       {
         mp3->stop();
         log_w("Audio: loop");
-        playSong(audio_current_Song);
+        playSong(nextAudioFile);
       }
     }
   }