diff --git a/bpf/dns_tracker.h b/bpf/dns_tracker.h
index aa7f51bd9e1c91d722583db6bc845224116bbfe1..a2253fa8c0caa8a3fcd0b684695894d30e95115d 100644
--- a/bpf/dns_tracker.h
+++ b/bpf/dns_tracker.h
@@ -97,10 +97,10 @@ static __always_inline int track_dns_packet(struct __sk_buff *skb, pkt_info *pkt
             u64 *value = bpf_map_lookup_elem(&dns_flows, &dns_req);
             if (value != NULL) {
                 pkt->dns_latency = ts - *value;
-                pkt->dns_id = dns_id;
-                pkt->dns_flags = flags;
                 bpf_map_delete_elem(&dns_flows, &dns_req);
             }
+            pkt->dns_id = dns_id;
+            pkt->dns_flags = flags;
         } // end of dns response
     }
     return 0;
diff --git a/pkg/ebpf/bpf_arm64_bpfel.o b/pkg/ebpf/bpf_arm64_bpfel.o
index 6799800d3ded282d756355f0968001f432e7b873..dcdd23937e5e9423010de994b7878e48f5bafc86 100644
Binary files a/pkg/ebpf/bpf_arm64_bpfel.o and b/pkg/ebpf/bpf_arm64_bpfel.o differ
diff --git a/pkg/ebpf/bpf_powerpc_bpfel.o b/pkg/ebpf/bpf_powerpc_bpfel.o
index 150f88257cf8a872910a0770895cfc04cabb20a6..093075263a48bd88c295f37b52c48567c1cf7504 100644
Binary files a/pkg/ebpf/bpf_powerpc_bpfel.o and b/pkg/ebpf/bpf_powerpc_bpfel.o differ
diff --git a/pkg/ebpf/bpf_s390_bpfeb.o b/pkg/ebpf/bpf_s390_bpfeb.o
index 63ca818578088165e526396ce5360060b96cb8d4..ee030a6addec617e001f6e5f7a002f2e04820a60 100644
Binary files a/pkg/ebpf/bpf_s390_bpfeb.o and b/pkg/ebpf/bpf_s390_bpfeb.o differ
diff --git a/pkg/ebpf/bpf_x86_bpfel.o b/pkg/ebpf/bpf_x86_bpfel.o
index 3b49c6d63f925ff25834e23ab79e821c881d0624..818c2c7654e9da52dac65d345fe4bea049dbaa8a 100644
Binary files a/pkg/ebpf/bpf_x86_bpfel.o and b/pkg/ebpf/bpf_x86_bpfel.o differ