diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
index 8fe511c..fc88169 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
@@ -127,7 +127,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
 
                     if (currentSong.finished()) {
                         if (loop == Loop.CURRENT) {
-                            currentSong.setTime(0);
+                            currentSong.loop();
                             return;
                         }
 
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/Song.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/Song.java
index c134ead..440d25d 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/Song.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/Song.java
@@ -105,6 +105,15 @@ public class Song {
     }
   }
 
+  public void loop () {
+    position = 0;
+    startTime += length - loopPosition;
+    time -= length - loopPosition;
+    while (position < notes.size() && notes.get(position).time < loopPosition) {
+      position++;
+    }
+  }
+
   public Note getNextNote () {
     if (position >= notes.size()) {
       if (bot.music.loop == Loop.OFF) return null;