diff --git a/src/Chan.cpp b/src/Chan.cpp
index 557f0b17..8c1250a4 100644
--- a/src/Chan.cpp
+++ b/src/Chan.cpp
@@ -527,6 +527,9 @@ CNick* CChan::FindNick(const CString& sNick) {
 
 void CChan::SendBuffer(CClient* pClient) {
 	SendBuffer(pClient, m_Buffer);
+	if (AutoClearChanBuffer()) {
+		ClearBuffer();
+	}
 }
 
 void CChan::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
@@ -575,10 +578,6 @@ void CChan::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
 				if (pClient)
 					break;
 			}
-
-			if (AutoClearChanBuffer()) {
- 				ClearBuffer();
-			}
 		}
 	}
 }