diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp
index c0b73d3c0..78efab9d0 100644
--- a/src/ct_chat.cpp
+++ b/src/ct_chat.cpp
@@ -343,6 +343,10 @@ static void CT_ClearChatMessage ()
 
 static void ShoveChatStr (const char *str, BYTE who)
 {
+	// Don't send empty messages
+	if (str == NULL || str[0] == '\0')
+		return;
+
 	FString substBuff;
 
 	if (str[0] == '/' &&