diff --git a/src/Bot/Commands/Utils/Quote/Quote.cs b/src/Bot/Commands/Utils/Quote/Quote.cs
index 47986a0..6a94309 100644
--- a/src/Bot/Commands/Utils/Quote/Quote.cs
+++ b/src/Bot/Commands/Utils/Quote/Quote.cs
@@ -147,8 +147,8 @@ namespace Geekbot.Bot.Commands.Utils.Quote
                    .Where(row => row.GuildId == Context.Guild.Id.AsLong())
                    .GroupBy(row => row.UserId)
                    .Select(row => new { userId = row.Key, amount = row.Count()})
-                   .OrderBy(row => row.amount)
-                   .Last();
+                   .OrderByDescending(row => row.amount)
+                   .First();
                var mostQuotedPersonUser = Context.Client.GetUserAsync(mostQuotedPerson.userId.AsUlong()).Result ?? new UserPolyfillDto {Username = "Unknown User"};
 
                var quotesByYear = _database.Quotes
diff --git a/src/Core/Highscores/HighscoreManager.cs b/src/Core/Highscores/HighscoreManager.cs
index 7379e5e..c839b39 100644
--- a/src/Core/Highscores/HighscoreManager.cs
+++ b/src/Core/Highscores/HighscoreManager.cs
@@ -27,6 +27,7 @@ namespace Geekbot.Core.Highscores
                 HighscoreTypes.rolls => GetRollsList(guildId, amount),
                 HighscoreTypes.cookies => GetCookiesList(guildId, amount),
                 HighscoreTypes.seasons => GetMessageSeasonList(guildId, amount, season),
+                HighscoreTypes.quotes => GetQuotesList(guildId, amount),
                 _ => new Dictionary<ulong, int>()
             };
 
@@ -115,5 +116,16 @@ namespace Geekbot.Core.Highscores
                 .Take(amount)
                 .ToDictionary(key => key.UserId.AsUlong(), key => key.Cookies);
         }
+        
+        private Dictionary<ulong, int> GetQuotesList(ulong guildId, int amount)
+        {
+            return _database.Quotes
+                .Where(row => row.GuildId == guildId.AsLong())
+                .GroupBy(row => row.UserId)
+                .Select(row => new { userId = row.Key, amount = row.Count()})
+                .OrderByDescending(row => row.amount)
+                .Take(amount)
+                .ToDictionary(key => key.userId.AsUlong(), key => key.amount);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Core/Highscores/HighscoreTypes.cs b/src/Core/Highscores/HighscoreTypes.cs
index 9901c98..3aa396e 100644
--- a/src/Core/Highscores/HighscoreTypes.cs
+++ b/src/Core/Highscores/HighscoreTypes.cs
@@ -6,6 +6,7 @@
         karma,
         rolls,
         cookies,
-        seasons
+        seasons,
+        quotes
     }
 }
\ No newline at end of file