diff --git a/lib/msf/core/exploit/dns/enumeration.rb b/lib/msf/core/exploit/dns/enumeration.rb
index 57ccca0336f87..4c6bad8c0ae02 100644
--- a/lib/msf/core/exploit/dns/enumeration.rb
+++ b/lib/msf/core/exploit/dns/enumeration.rb
@@ -19,7 +19,7 @@ def initialize(info = {})
 
     register_advanced_options(
       [
-        OptBool.new('DnsNote', [false, 'Save all DNS result into the notes (default: true)', true]),
+        OptBool.new('DnsNote', [false, 'Save all DNS results as notes', true]),
         OptInt.new('DnsClientUdpTimeout', [true, 'Number of seconds to wait for a response to a UDP query', 8])
       ]
     )
@@ -59,7 +59,6 @@ def dns_axfr(domain)
       print_good("#{domain} Zone Transfer: #{zone}")
     end
     return if records.blank?
-    dns_note(domain, 'DNS AXFR recods', records) if datastore['DnsNote']
     records
   end
 
diff --git a/modules/auxiliary/gather/cloud_lookup.rb b/modules/auxiliary/gather/cloud_lookup.rb
index 2e8b29e3be564..ad934e233e802 100644
--- a/modules/auxiliary/gather/cloud_lookup.rb
+++ b/modules/auxiliary/gather/cloud_lookup.rb
@@ -32,6 +32,7 @@ def initialize(info = {})
         'References' => [
           ['URL', 'https://citadelo.com/en/blog/cloudflare-how-to-do-it-right-and-do-not-reveal-your-real-ip/']
         ],
+        'DefaultOptions' => { 'DnsNote' => false },
         'License' => MSF_LICENSE,
         'Actions' => [
           ['Automatic', {}],
@@ -117,8 +118,6 @@ def initialize(info = {})
       OptString.new('USERAGENT', [true, 'Specify a personalized User-Agent header in HTTP requests', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:56.0) Gecko/20100101 Firefox/56.0']),
       OptEnum.new('TAG', [true, 'Specify the HTML tag in which you want to find the fingerprint', 'title', ['title', 'html']]),
       OptInt.new('HTTP_TIMEOUT', [true, 'HTTP(s) request timeout', 8]),
-      # DNS options
-      OptBool.new('DnsNote', [false, 'Save all DNS result into the notes (default: false)', false]),
     ])
   end