diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index e3761ab..abde395 100644
--- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -581,6 +581,11 @@ class PlayerEventHandler implements Listener
 		    {
 		        event.setCancelled(this.handlePlayerChat(event.getPlayer(), event.getMessage(), event));
 		    }
+	        
+	        if(!player.hasPermission("griefprevention.spam") && this.bannedWordFinder.hasMatch(message))
+	        {
+	            event.setCancelled(true);
+	        }
 		    
 		    //unless cancelled, log in abridged logs
 	        if(!event.isCancelled())