diff --git a/src/map/clif.c b/src/map/clif.c
index 036f38a98d..7a44ef2a53 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9803,7 +9803,10 @@ static bool clif_process_message(struct map_session_data* sd, int format, char**
 	}
 
 #if PACKETVER >= 20151001
-	message[messagelen++] = '\0';
+	if (message[messagelen-1] != '\0')
+	{
+		message[messagelen++] = '\0';
+	}
 #endif
 
 	// the declared length must match real length