diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
index fff61d22..26639165 100644
--- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
@@ -28,7 +28,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl
             var rngk = new NadekoRandom();
             lowertext = text.ToLowerInvariant();
 	    uppertext = text.ToUpperInvariant();
-            return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync();
+            return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword && (q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext))).OrderBy(q => rngk.Next()).FirstOrDefaultAsync();
 	}
     }
 }