diff --git a/IRCSock.cpp b/IRCSock.cpp
index ec71c451..34aa5aa4 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -614,7 +614,9 @@ void CIRCSock::ReadLine(const CString& sData) {
 					sMsg.LeftChomp();
 				}
 
-				m_pUser->AddQueryBuffer(":" + Nick.GetNickMask() + " WALLOPS ", ":" + m_pUser->AddTimestamp(sMsg), false);
+				if (!m_pUser->IsUserAttached()) {
+					m_pUser->AddQueryBuffer(":" + Nick.GetNickMask() + " WALLOPS ", ":" + m_pUser->AddTimestamp(sMsg), false);
+				}
 			}
 		}
 	}