diff --git a/IRCSock.cpp b/IRCSock.cpp
index 80cb4a70..d31830e8 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -808,6 +808,10 @@ bool CIRCSock::OnGeneralCTCP(CNick& Nick, CString& sMessage) {
 	if (it != mssCTCPReplies.end()) {
 		sReply = m_pUser->ExpandString(it->second);
 		bHaveReply = true;
+
+		if (sReply.empty()) {
+			return true;
+		}
 	}
 
 	if (!bHaveReply && !m_pUser->IsUserAttached()) {