diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
index 3f1804524..c23a20eef 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
@@ -96,6 +96,20 @@
                         <AAAA>AAAA (IPv6 address)</AAAA>
                         <MX>MX (Mail server)</MX>
                     </OptionValues>
+                    <Constraints>
+                        <check001>
+                            <reference>mxprio.check001</reference>
+                        </check001>
+                        <check002>
+                            <reference>mx.check001</reference>
+                        </check002>
+                        <check003>
+                            <reference>server.check001</reference>
+                        </check003>
+                        <check004>
+                            <reference>server.check002</reference>
+                        </check004>
+                    </Constraints>
                 </rr>
                 <mxprio type="IntegerField">
                     <Constraints>
@@ -125,6 +139,12 @@
                             <field>rr</field>
                             <check>A</check>
                         </check001>
+                        <check002>
+                            <ValidationMessage>The field IP address is required.</ValidationMessage>
+                            <type>SetIfConstraint</type>
+                            <field>rr</field>
+                            <check>AAAA</check>
+                        </check002>
                     </Constraints>
                 </server>
                 <description type="TextField">
diff --git a/src/opnsense/mvc/app/views/OPNsense/Unbound/overrides.volt b/src/opnsense/mvc/app/views/OPNsense/Unbound/overrides.volt
index d5a19128c..8b0bac34e 100755
--- a/src/opnsense/mvc/app/views/OPNsense/Unbound/overrides.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Unbound/overrides.volt
@@ -80,7 +80,7 @@ $( document ).ready(function() {
 
                 /* Hide/unhide input fields based on selected RR (Type) value */
                 $('select[id="host.rr"]').on('change', function(e) {
-                    if (this.value == "A") {
+                    if (this.value == "A" || this.value == "AAAA") {
                         $('tr[id="row_host.mx"]').addClass('hidden');
                         $('tr[id="row_host.mxprio"]').addClass('hidden');
                         $('tr[id="row_host.server"]').removeClass('hidden');