diff --git a/src/utils/dig/dig_exec.c b/src/utils/dig/dig_exec.c
index 77323743beca4e6e7d0bd9ac855e07adaacb0f31..8a13e96303c99b30d69679066f85fa7ce08d8742 100644
--- a/src/utils/dig/dig_exec.c
+++ b/src/utils/dig/dig_exec.c
@@ -137,7 +137,7 @@ static knot_packet_t* create_query_packet(const query_t *query,
 	}
 
 	// Create EDNS section if required.
-	if (query->flags.do_flag || query->nsid) {
+	if (query->udp_size > 0 || query->flags.do_flag || query->nsid) {
 		knot_opt_rr_t *opt_rr = knot_edns_new();
 		if (opt_rr == NULL) {
 			ERR("can't create EDNS section\n");