diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index 2427c0944e8..eed0c0b4683 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -119,9 +119,15 @@ function unbound_generate_config()
 
     $optimization = unbound_optimization();
 
+    $respip = '';
     $dns64prefix = '';
     if (isset($config['unbound']['dns64'])) {
-        $module_config = 'dns64 ';
+        if (isset($config['unbound']['noarecords'])) {
+            $module_config = 'respip dns64 ';
+            $respip = "response-ip: 0.0.0.0/0 redirect";
+        } else {
+            $module_config = 'dns64 ';
+        }
         if (!empty($config['unbound']['dns64prefix'])) {
             $dns64prefix = "dns64-prefix: {$config['unbound']['dns64prefix']}";
         }
@@ -345,6 +351,7 @@ rrset-cache-size: {$rrsetcachesize}m
 {$anchor_file}
 {$forward_local}
 {$dns64prefix}
+{$respip}
 prefetch: {$prefetch}
 prefetch-key: {$prefetch_key}
 
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 3f6b1507543..128256d87d4 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -43,6 +43,7 @@
     $pconfig['enable_wpad'] = isset($a_unboundcfg['enable_wpad']);
     $pconfig['dnssec'] = isset($a_unboundcfg['dnssec']);
     $pconfig['dns64'] = isset($a_unboundcfg['dns64']);
+    $pconfig['noarecords'] = isset($a_unboundcfg['noarecords']);
     $pconfig['reglladdr6'] = empty($a_unboundcfg['noreglladdr6']);
     $pconfig['regdhcp'] = isset($a_unboundcfg['regdhcp']);
     $pconfig['regdhcpstatic'] = isset($a_unboundcfg['regdhcpstatic']);
@@ -113,6 +114,7 @@
             // boolean values
             $a_unboundcfg['cacheflush'] = !empty($pconfig['cacheflush']);
             $a_unboundcfg['dns64'] = !empty($pconfig['dns64']);
+            $a_unboundcfg['noarecords'] = !empty($pconfig['noarecords']);
             $a_unboundcfg['dnssec'] = !empty($pconfig['dnssec']);
             $a_unboundcfg['enable'] = !empty($pconfig['enable']);
             $a_unboundcfg['enable_wpad'] = !empty($pconfig['enable_wpad']);
@@ -246,6 +248,12 @@
                             <?= gettext("If no DNS64 prefix is specified, the default prefix " .
                             "64:ff9b::/96 (RFC 6052) will be used."); ?>
                           </div>
+                          <input name="noarecords" type="checkbox" id="noarecords" value="yes" <?=!empty($pconfig['noarecords']) ? 'checked="checked"' : '';?> />
+                          <?= gettext('Enable AAAA-only mode') ?>
+                          <div class="hidden" data-for="help_for_dns64">
+                            <?= gettext("If this option is set, Unbound will remove all A " .
+                            "records from the answer section of all responses."); ?>
+                          </div>
                         </td>
                       </tr>
                       <tr>