diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 69fbbe65e4c..b2374ea7cbf 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -226,7 +226,7 @@
 	..()	//redirect to hsrc.()
 
 /client/proc/handle_spam_prevention(var/message, var/mute_type)
-	if (config.automute_on && !holder)
+	if (config.automute_on && !holder && length(message))
 		if (last_message_time)
 			if (world.time - last_message_time < config.macro_trigger)
 				spam_alert++
@@ -243,7 +243,7 @@
 
 		last_message_time = world.time
 
-		if(!isnull(message) && last_message == message)
+		if(last_message == message)
 			last_message_count++
 			if(last_message_count >= SPAM_TRIGGER_AUTOMUTE)
 				src << "<span class='danger'>You have exceeded the spam filter limit for identical messages. An auto-mute was applied.</span>"
diff --git a/html/changelogs/skull132-spam.yml b/html/changelogs/skull132-spam.yml
new file mode 100644
index 00000000000..c64f94a5672
--- /dev/null
+++ b/html/changelogs/skull132-spam.yml
@@ -0,0 +1,5 @@
+author: Skull132
+delete-after: true
+
+changes:
+  - bugfix: "I caved and made the spam filter actually work. It should no longer mute you for empty strings that are worthless."