diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp
index fba3d264..a64891d4 100644
--- a/core/ChatTriggers.cpp
+++ b/core/ChatTriggers.cpp
@@ -333,11 +333,8 @@ void ChatTriggers::OnSayCommand_Post()
 {
 	int client = g_ConCmds.GetCommandClient();
 
-	if (m_bWillProcessInPost)
+	if (m_bWillProcessInPost && client > 0)
 	{
-		/* Reset this for re-entrancy */
-		m_bWillProcessInPost = false;
-		
 		/* Execute the cached command */
 		unsigned int old = SetReplyTo(SM_REPLY_CHAT);
 #if SOURCE_ENGINE == SE_DOTA
@@ -348,6 +345,9 @@ void ChatTriggers::OnSayCommand_Post()
 		SetReplyTo(old);
 	}
 
+	/* Reset this for re-entrancy */
+	m_bWillProcessInPost = false;
+
 	if (m_bPluginIgnored)
 	{
 		m_bPluginIgnored = false;