diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 4f0ada31f..13b5fb7c6 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -1202,7 +1202,7 @@ typedef enum {
 } TSUuidVersion;

 #define TS_UUID_STRING_LEN 36
-#define TS_CRUUID_STRING_LEN (TS_UUID_STRING_LEN + 20 + 1) /* UUID-len + len(int64_t) + '-' */
+#define TS_CRUUID_STRING_LEN (TS_UUID_STRING_LEN + 20 + 2) /* UUID-len + len(int64_t) + '-' + '\n' */
 typedef struct tsapi_uuid *TSUuid;

 #ifdef __cplusplus
diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc
index 4b57dbabb..37cb06b3f 100644
--- a/plugins/header_rewrite/conditions.cc
+++ b/plugins/header_rewrite/conditions.cc
@@ -1051,7 +1051,7 @@ ConditionId::append_value(std::string &s, const Resources &res ATS_UNUSED)
     }
   } break;
   case ID_QUAL_UNIQUE: {
-    char uuid[TS_CRUUID_STRING_LEN + 1];
+    char uuid[TS_CRUUID_STRING_LEN];

     if (TS_SUCCESS == TSClientRequestUuidGet(res.txnp, uuid)) {
       s += uuid;
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index 7100c8121..504bee67c 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -781,7 +781,7 @@ int
 LogAccessHttp::marshal_client_req_uuid(char *buf)
 {
   if (buf) {
-    char str[TS_CRUUID_STRING_LEN + 1];
+    char str[TS_CRUUID_STRING_LEN];
     const char *uuid = (char *)Machine::instance()->uuid.getString();
     int len;

@@ -793,7 +793,7 @@ LogAccessHttp::marshal_client_req_uuid(char *buf)
     return len;
   }

-  return round_strlen(TS_CRUUID_STRING_LEN + 1);
+  return round_strlen(TS_CRUUID_STRING_LEN);
 }

 /*-------------------------------------------------------------------------