diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
index a1b0d0a9..fe7fe953 100644
--- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
+++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
@@ -130,15 +130,15 @@ namespace NadekoBot.Modules.Music.Classes
                 {
                     try
                     {
-                        if (audioClient != null)
-                            try { await audioClient.DisconnectAsync().ConfigureAwait(false); } catch { }
-                        audioClient = await PlaybackVoiceChannel.ConnectAsync().ConfigureAwait(false);
-
                         CurrentSong = GetNextSong();
 
                         if (CurrentSong == null)
                             continue;
 
+                        if (audioClient != null)
+                            try { await audioClient.DisconnectAsync().ConfigureAwait(false); } catch { }
+                        audioClient = await PlaybackVoiceChannel.ConnectAsync().ConfigureAwait(false);
+
                         var index = playlist.IndexOf(CurrentSong);
                         if (index != -1)
                             RemoveSongAt(index, true);