diff --git a/Tonuino.ino b/Tonuino.ino
index 06a46e3..c3ce9c9 100644
--- a/Tonuino.ino
+++ b/Tonuino.ino
@@ -458,7 +458,12 @@ class RepeatSingleModifier: public Modifier {
       Serial.println(F("== RepeatSingleModifier::handleNext() -> REPEAT CURRENT TRACK"));
       delay(50);
       if (isPlaying()) return true;
-      mp3.playFolderTrack(myFolder->folder, currentTrack);
+      if (myFolder->mode == 3 || myFolder->mode == 9){
+        mp3.playFolderTrack(myFolder->folder, queue[currentTrack - 1]);
+      }
+      else{
+        mp3.playFolderTrack(myFolder->folder, currentTrack);
+      }
       _lastTrackFinished = 0;
       return true;
     }