diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
index bf07a508..d5581884 100644
--- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
+++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
@@ -163,7 +163,7 @@ namespace NadekoBot.Modules.Music.Classes
                         }
 
 
-                        if (RepeatPlaylist)
+                        if (RepeatPlaylist & !RepeatSong)
                             AddSong(CurrentSong, CurrentSong.QueuerName);
 
                         if (RepeatSong)
diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
index 41c29a44..ea4bc674 100644
--- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
@@ -97,7 +97,7 @@ namespace NadekoBot.Modules.Utility
                 if (keywordquote == null)
                     return;
 
-                await Context.Channel.SendMessageAsync("💬 " + keyword.ToLowerInvariant() + ":  " +
+                await Context.Channel.SendMessageAsync($"`#{keywordquote.Id}` 💬 " + keyword.ToLowerInvariant() + ":  " +
                                                        keywordquote.Text.SanitizeMentions());
             }
 
@@ -176,4 +176,4 @@ namespace NadekoBot.Modules.Utility
             }
         }
     }
-}
\ No newline at end of file
+}