diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index 8564d0db08..0999f90e0f 100644
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -612,10 +612,13 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
 			}
 		}
 		
-		if (blen && !clen) {
-			snprintf(buf + len, dlen - len, "Content-Length: %d\n\n%s", (int)strlen(event->body), event->body);
-		} else {
-			snprintf(buf + len, dlen - len, "\n");
+		if (blen) {
+			if (clen) {
+				snprintf(buf + len, dlen - len, "\n%s", event->body);
+			} else {
+				snprintf(buf + len, dlen - len, "Content-Length: %d\n\n%s", (int)strlen(event->body), event->body);
+			
+			}
 		}
 	} else {
 		snprintf(buf + len, dlen - len, "\n");