diff --git a/DnsServerCore/Dns/DnsServer.cs b/DnsServerCore/Dns/DnsServer.cs
index a0d220a1..a233f4f9 100644
--- a/DnsServerCore/Dns/DnsServer.cs
+++ b/DnsServerCore/Dns/DnsServer.cs
@@ -1099,7 +1099,12 @@ namespace DnsServerCore.Dns
             }
 
             if (request.EDNS is null)
+            {
+                if (response.EDNS is not null)
+                    response = response.CloneWithoutEDns();
+
                 return response;
+            }
 
             if (response.EDNS is not null)
                 return response;