diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
index 26a90c9..832acab 100644
--- a/codemp/server/sv_main.cpp
+++ b/codemp/server/sv_main.cpp
@@ -160,6 +160,14 @@ void QDECL SV_SendServerCommand(client_t *cl, const char *fmt, ...) {
 	vsprintf ((char *)message, fmt,argptr);
 	va_end (argptr);
 
+	// Fix to http://aluigi.altervista.org/adv/q3msgboom-adv.txt
+	// The actual cause of the bug is probably further downstream
+	// and should maybe be addressed later, but this certainly
+	// fixes the problem for now
+	if ( strlen ((char *)message) > 1022 ) {
+		return;
+	}
+
 	if ( cl != NULL ) {
 		SV_AddServerCommand( cl, (char *)message );
 		return;