diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf
index 05141d115..56e8ef285 100644
--- a/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf
+++ b/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf
@@ -1,13 +1,20 @@
 {% if not helpers.empty('OPNsense.unboundplus.dots.dot') %}
 {%   set dots = [] %}
+{%   set local = [] %}
 {%   for dot in helpers.toList('OPNsense.unboundplus.dots.dot') %}
 {%     if dot.enabled == '1' %}
+{%       if dot.server.startswith('127.') or dot.server == '::1' %}
+{%         do local.append('1') %}
+{%       endif %}
 {%       do dots.append(dot) %}
 {%     endif %}
 {%   endfor %}
 {%   if dots|length > 0 %}
 server:
   tls-cert-bundle: /etc/ssl/cert.pem
+{%     if local|length > 0 %}
+  do-not-query-localhost: no
+{%     endif %}
 forward-zone:
   name: "."
   forward-tls-upstream: yes