diff --git a/lib/log_blackbox.c b/lib/log_blackbox.c
index f7530ff..e6fbf7a 100644
--- a/lib/log_blackbox.c
+++ b/lib/log_blackbox.c
@@ -96,6 +96,13 @@ _blackbox_vlogger(int32_t target,
 
 	/* log message */
 	msg_len = qb_vsprintf_serialize(chunk, cs->format, ap);
+	if(msg_len > QB_LOG_MAX_LEN) {
+	    chunk = msg_len_pt + sizeof(uint32_t); /* Reset */
+
+	    msg_len = qb_vsprintf_serialize(chunk, "Log message too long to be stored in the blackbox.  Maximum is QB_LOG_MAX_LEN" , ap);
+	    actual_size += msg_len;
+	}
+
 	actual_size += msg_len;
 
 	/* now that we know the length, write it