diff --git a/src/Query.cpp b/src/Query.cpp
index 2177d2f2..ea500c1b 100644
--- a/src/Query.cpp
+++ b/src/Query.cpp
@@ -56,7 +56,7 @@ void CQuery::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
 				size_t uSize = Buffer.Size();
 				for (size_t uIdx = 0; uIdx < uSize; uIdx++) {
 					const CBufLine& BufLine = Buffer.GetBufLine(uIdx);
-					CMessage Message(BufLine.GetLine(*pUseClient, MCString::EmptyMap));
+					CMessage Message(BufLine.GetLine(*pUseClient, msParams));
 					if (!pUseClient->HasEchoMessage() && !pUseClient->HasSelfMessage()) {
 						if (Message.GetNick().NickEquals(pUseClient->GetNick())) {
 							continue;