diff --git a/Tonuino.ino b/Tonuino.ino
index ee012d2..f3f61c4 100644
--- a/Tonuino.ino
+++ b/Tonuino.ino
@@ -86,6 +86,8 @@ static void nextTrack(uint16_t track) {
   }
   if (myCard.mode == 3) {
     currentTrack = random(1, numTracksInFolder + 1);
+    if (currentTrack == _lastTrackFinished)
+      currentTrack = currentTrack == numTracksInFolder+1 ? 1 : currentTrack+1;
     Serial.print(F("Party Modus ist aktiv -> zufälligen Track spielen: "));
     Serial.println(currentTrack);
     mp3.playFolderTrack(myCard.folder, currentTrack);