diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index a967be033bb..a5a6ba1547a 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -174,7 +174,7 @@ proc/get_radio_key_from_channel(var/channel)
 		else
 			message = copytext(message,3)
 
-	message = trim_left(message)
+	message = trim(message)
 
 	var/static/list/correct_punctuation = list("!" = TRUE, "." = TRUE, "?" = TRUE, "-" = TRUE, "~" = TRUE, "*" = TRUE, "/" = TRUE, ">" = TRUE, "\"" = TRUE, "'" = TRUE, "," = TRUE, ":" = TRUE, ";" = TRUE)
 	var/ending = copytext(message, length(message), (length(message) + 1))
diff --git a/html/changelogs/prevents_trailing_whitespace.yml b/html/changelogs/prevents_trailing_whitespace.yml
new file mode 100644
index 00000000000..3dc35e7d598
--- /dev/null
+++ b/html/changelogs/prevents_trailing_whitespace.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Trailing whitespaces on chat messages is now removed, preventing messages occuring with several whitespaces and then the automatically added period."
\ No newline at end of file