diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp
index 039a55ec..128b724b 100644
--- a/src/AudioPlayer.cpp
+++ b/src/AudioPlayer.cpp
@@ -99,6 +99,20 @@ void Audio_TaskResume(void) {
 	bool audio_active = true;
 }
 
+void Audio_InfoCallback(Audio::msg_t m) {
+	switch(m.e) {
+        case Audio::evt_info:
+            Log_Printf(LOGLEVEL_DEBUG, "Audio lib info event: %s", m.msg);
+			break;
+		case Audio::evt_eof:
+			Log_Printf(LOGLEVEL_DEBUG, "Audio lib: finished playing file %s", m.msg);
+			gPlayProperties.trackFinished = true;
+			break;
+		default:
+			break;
+    }
+}
+
 void AudioPlayer_Init(void) {
 	// create audio object
 #ifdef BOARD_HAS_PSRAM
@@ -210,6 +224,7 @@ void AudioPlayer_Init(void) {
 		gPrefsSettings.getChar("gainHighPass", 0));
 
 	audio->setAudioTaskCore(1);
+	audio->audio_info_callback = Audio_InfoCallback;
 
 	audio_active = true;
 }
@@ -927,7 +942,8 @@ void AudioPlayer_Loop() {
 		// we check for timeout
 		if (noAudio && timeout) {
 			// Audio playback timed out, move on to the next
-			// System_IndicateError();
+			Log_Println(audioPlaybackTimeout, LOGLEVEL_ERROR);
+			System_IndicateError();
 			gPlayProperties.trackFinished = true;
 			playbackTimeoutStart = millis();
 		}
diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp
index a270a604..0366a742 100644
--- a/src/LogMessages_DE.cpp
+++ b/src/LogMessages_DE.cpp
@@ -236,4 +236,5 @@ const char wifiSetLastSSID[] = "Schreibe letzte erfolgreiche SSID in NVS für WL
 const char mDNSStarted[] = "mDNS gestartet: http://%s.local";
 const char mDNSFailed[] = "mDNS Start fehlgeschlagen, Hostname: %s";
 const char restartAfterOperationModeChange[] = "Operation Mode geändert. ESPuino wird neu gestartet...";
+const char audioPlaybackTimeout[] = "Zeitüberschreitung bei der Musikwiedergabe, springe zum nächsten Titel";
 #endif
diff --git a/src/LogMessages_EN.cpp b/src/LogMessages_EN.cpp
index 2d18f386..eb749977 100644
--- a/src/LogMessages_EN.cpp
+++ b/src/LogMessages_EN.cpp
@@ -237,4 +237,5 @@ const char wifiSetLastSSID[] = "Write last successful SSID to NVS for WiFi fast-
 const char mDNSStarted[] = "mDNS started: http://%s.local";
 const char mDNSFailed[] = "mDNS failure, hostname: %s";
 const char restartAfterOperationModeChange[] = "Operation Mode changed. Restart ESPuino now...";
+const char audioPlaybackTimeout[] = "Playback timed out, advancing to the next track";
 #endif
diff --git a/src/LogMessages_FR.cpp b/src/LogMessages_FR.cpp
index 886310c2..3ac22ae5 100644
--- a/src/LogMessages_FR.cpp
+++ b/src/LogMessages_FR.cpp
@@ -235,4 +235,5 @@ const char wifiSetLastSSID[] = "Écrire le dernier SSID réussi dans le NVS pour
 const char mDNSStarted[] = "mDNS démarré : http://%s.local";
 const char mDNSFailed[] = "Échec de mDNS, nom d'hôte : %s";
 const char restartAfterOperationModeChange[] = "Le mode de fonctionnement a changé. Redémarrez ESPuino maintenant...";
+const char audioPlaybackTimeout[] = "La lecture audio a expiré, passage à la piste suivante";
 #endif
diff --git a/src/logmessages.h b/src/logmessages.h
index c06f0439..429c7742 100644
--- a/src/logmessages.h
+++ b/src/logmessages.h
@@ -236,3 +236,4 @@ extern const char mDNSFailed[];
 extern const char restartAfterOperationModeChange[];
 extern const char jumpForwardsToFolder[];
 extern const char jumpBackwardsToFolder[];
+extern const char audioPlaybackTimeout[];