diff --git a/User.cpp b/User.cpp
index aa8e5879..97acada3 100644
--- a/User.cpp
+++ b/User.cpp
@@ -62,6 +62,7 @@ CUser::CUser(const CString& sUserName) {
 	m_pModules = new CModules;
 	m_RawBuffer.SetLineCount(100);   // This should be more than enough raws, especially since we are buffering the MOTD separately
 	m_MotdBuffer.SetLineCount(200);  // This should be more than enough motd lines
+	m_QueryBuffer.SetLineCount(250);
 	m_bMultiClients = true;
 	m_bBounceDCCs = true;
 	m_eHashType = HASH_NONE;