diff --git a/NameFilter/scripting/NameFilter.sp b/NameFilter/scripting/NameFilter.sp
index 6c57e400..edd7af57 100644
--- a/NameFilter/scripting/NameFilter.sp
+++ b/NameFilter/scripting/NameFilter.sp
@@ -1,5 +1,6 @@
 #include <sdktools>
 #include <regex>
+#include <basecomm>
 
 #pragma semicolon 1
 #pragma newdecls required
@@ -114,9 +115,10 @@ public Action UserMessage_SayText2(UserMsg msg_id, BfRead msg, const int[] playe
 		return Plugin_Handled;
 	}
 
-	if(FilterName(client, sNewName))
+	bool bGagged = BaseComm_IsClientGagged(client);
+	if(FilterName(client, sNewName) || bGagged)
 	{
-		if(StrEqual(sOldName, sNewName))
+		if(StrEqual(sOldName, sNewName) || bGagged)
 		{
 			g_iBlockNameChangeEvents[client] = 3;
 			SetClientName(client, sOldName);