diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index ac3d6d216b8090bba21d22db1ff4dc5ae812d20f..15657867dc23f6335609db1852b2a71d6fb978d7 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -57,7 +57,8 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
   size_t failure = (size * nmemb) ? 0 : 1;
 
 #ifdef DEBUGBUILD
-  if(size * nmemb > (size_t)CURL_MAX_WRITE_SIZE) {
+  if((size * nmemb > (size_t)CURL_MAX_WRITE_SIZE) ||
+     (size * nmemb > (size_t)CURL_MAX_HTTP_HEADER)) {
     warnf(outs->config, "Header data exceeds single call write limit!\n");
     return failure;
   }