diff --git a/src/main/java/net/Broken/audio/TrackScheduler.java b/src/main/java/net/Broken/audio/TrackScheduler.java
index 33b4503..b0659e4 100644
--- a/src/main/java/net/Broken/audio/TrackScheduler.java
+++ b/src/main/java/net/Broken/audio/TrackScheduler.java
@@ -153,7 +153,8 @@ public class TrackScheduler extends AudioEventAdapter {
         // Start the next track, regardless of if something is already playing or not. In case queue was empty, we are
         // giving null to startTrack, which is a valid argument and will simply stop the player.
         UserAudioTrack track = queue.poll();
-        this.currentPlayingTrack = track;
+        if(track != null)
+            this.currentPlayingTrack = track;
         if(track != null)
             player.startTrack(track.getAudioTrack(), false);
         needAutoPlay();