diff --git a/IRCSock.cpp b/IRCSock.cpp
index 871e5071..0e0237fe 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -822,15 +822,11 @@ bool CIRCSock::OnPrivCTCP(CNick& Nick, CString& sMessage) {
 
 bool CIRCSock::OnGeneralCTCP(CNick& Nick, CString& sMessage) {
 	const MCString& mssCTCPReplies = m_pUser->GetCTCPReplies();
-	MCString::const_iterator it = mssCTCPReplies.find(sMessage.AsUpper());
 	CString sQuery = sMessage.Token(0).AsUpper();
+	MCString::const_iterator it = mssCTCPReplies.find(sQuery);
 	bool bHaveReply = false;
 	CString sReply;
 
-	if (it == mssCTCPReplies.end()) {
-		it = mssCTCPReplies.find(sQuery);
-	}
-
 	if (it != mssCTCPReplies.end()) {
 		sReply = m_pUser->ExpandString(it->second);
 		bHaveReply = true;