diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 623776ed5..dba6d08e1 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -298,11 +298,11 @@
     </div>
     <br/>
     <div class="row">
-        <div class="col-md-12" ng-show="mailConfig.enabled && (dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual')">
+        <div class="col-md-12" ng-show="(dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual')">
             Set the following DNS records to guarantee email functionality.
 
             <div ng-repeat="record in expectedDnsRecordsTypes">
-               <div class="row">
+               <div class="row" ng-if="mailConfig.enabled || (record.name !== 'DMARC' && record.name !== 'MX')">
                     <div class="col-xs-12">
                         <h4 class="text-muted">
                             {{ record.name }} record <i ng-class="expectedDnsRecords[record.value].status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'" aria-hidden="true"></i>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index a4d3b3c52..42facf42a 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -507,9 +507,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     function showExpectedDnsRecords(callback) {
         callback = callback || function (error) { if (error) console.error(error); };
 
-        // nothing to check if mail is not enabled
-        if (!$scope.mailConfig.enabled) return;
-
         Client.getExpectedDnsRecords(function (error, dnsRecords) {
             if (error) return callback(error);