diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java
index 5154b80..08a1363 100644
--- a/src/main/java/com/bbn/hadder/audio/TrackManager.java
+++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java
@@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter {
 
     @Override
     public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
+        Guild g = queue.poll().getAuthor().getGuild();
         if (loop) {
             player.playTrack(track.makeClone());
         } else if (queue.isEmpty()) {
-            Guild g = queue.poll().getAuthor().getGuild();
             g.getAudioManager().closeAudioConnection();
         } else {
-            player.playTrack(queue.element().getTrack().makeClone());
+            player.playTrack(queue.element().getTrack());
         }
     }