diff --git a/src/request-internal.c b/src/request-internal.c
index ddad29ec..31a080b1 100644
--- a/src/request-internal.c
+++ b/src/request-internal.c
@@ -367,7 +367,8 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
 
 	with_opt = edns_do_bit != 0 || edns_maximum_udp_payload_size != 512 ||
 	    edns_extended_rcode != 0 || edns_version != 0 || noptions ||
-	    edns_cookies || context->edns_client_subnet_private;
+	    edns_cookies || context->edns_client_subnet_private ||
+	    context->tls_query_padding_blocksize > 1;
 
 	edns_maximum_udp_payload_size = with_opt &&
 	    ( edns_maximum_udp_payload_size == -1 ||
@@ -438,6 +439,7 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
 	result->dnssec_return_validation_chain = dnssec_return_validation_chain;
 	result->edns_cookies                   = edns_cookies;
 	result->edns_client_subnet_private     = context->edns_client_subnet_private;
+	result->tls_query_padding_blocksize    = context->tls_query_padding_blocksize;
 
 	/* will be set by caller */
 	result->user_pointer = NULL;
diff --git a/src/types-internal.h b/src/types-internal.h
index 7c05e2b9..96b458f0 100644
--- a/src/types-internal.h
+++ b/src/types-internal.h
@@ -276,6 +276,7 @@ typedef struct getdns_dns_req {
 	int dnssec_return_validation_chain;
 	int edns_cookies;
 	int edns_client_subnet_private;
+	uint16_t tls_query_padding_blocksize;
 
 	/* Internally used by return_validation_chain */
 	int dnssec_ok_checking_disabled;