diff --git a/src/log.c b/src/log.c
index 1cd98a0..5c6c8e4 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1505,8 +1505,10 @@
 
 	dataptr = message;
 
-	/* historically some messages used to already contain the trailing LF */
-	if (size && (dataptr[size-1] == '\n'))
+	/* historically some messages used to already contain the trailing LF
+	 * or Zero. Let's remove all trailing LF or Zero
+	 */
+	while (size && ((dataptr[size-1] == '\n' || (dataptr[size-1] == 0))))
 		size--;
 
 	if (logsrv->addr.ss_family == AF_UNSPEC) {