diff --git a/DnsServerCore/Zone.cs b/DnsServerCore/Zone.cs
index 81322071..4ac35743 100644
--- a/DnsServerCore/Zone.cs
+++ b/DnsServerCore/Zone.cs
@@ -1046,7 +1046,7 @@ namespace DnsServerCore
                     return; //nothing to do
             }
 
-            if ((response.Question.Length > 0) && (response.Question[0].Type != DnsResourceRecordType.NS))
+            if ((response.Question.Length > 0) && ((response.Question[0].Type != DnsResourceRecordType.NS) || (response.Answer.Length == 0)))
             {
                 foreach (DnsQuestionRecord question in response.Question)
                 {