diff --git a/llarp/handlers/tun.hpp b/llarp/handlers/tun.hpp
index f1626d468..298946d77 100644
--- a/llarp/handlers/tun.hpp
+++ b/llarp/handlers/tun.hpp
@@ -222,7 +222,7 @@ namespace llarp
           std::function<void(dns::Message)> reply,
           bool sendIPv6)
       {
-        if (ctx)
+        if (ctx or HasAddress(addr))
         {
           huint128_t ip = ObtainIPForAddr(addr);
           query->answers.clear();