diff --git a/src/NadekoBot/Services/Music/MusicPlayer.cs b/src/NadekoBot/Services/Music/MusicPlayer.cs
index bae20574..50779c85 100644
--- a/src/NadekoBot/Services/Music/MusicPlayer.cs
+++ b/src/NadekoBot/Services/Music/MusicPlayer.cs
@@ -62,7 +62,7 @@ namespace NadekoBot.Services.Music
         public bool RepeatCurrentSong { get; private set; }
         public bool Shuffle { get; private set; }
         public bool Autoplay { get; private set; }
-        public bool RepeatPlaylist { get; private set; } = false;
+        public bool RepeatPlaylist { get; private set; } = true;
         public uint MaxQueueSize
         {
             get => Queue.MaxQueueSize;
@@ -442,12 +442,12 @@ namespace NadekoBot.Services.Music
             }
         }
 
-        public void Stop(bool clearQueue = true)
+        public void Stop(bool clearQueue = false)
         {
             lock (locker)
             {
-                //Stopped = true;
-                //Queue.ResetCurrent();
+                Stopped = true;
+                Queue.ResetCurrent();
                 if (clearQueue)
                     Queue.Clear();
                 Unpause();