diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb
index acfafa3d4..bee0e032c 100644
--- a/app/jobs/update_whois_record_job.rb
+++ b/app/jobs/update_whois_record_job.rb
@@ -51,4 +51,4 @@ class UpdateWhoisRecordJob < Que::Job
   def delete_blocked(name)
     delete_reserved(name)
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index 3ff0e9023..42ea0b2fa 100644
--- a/app/models/whois_record.rb
+++ b/app/models/whois_record.rb
@@ -36,6 +36,7 @@ class WhoisRecord < ActiveRecord::Base
     registrant = domain.registrant
 
     @disclosed = []
+    h[:disclaimer] = disclaimer_text
     h[:name]       = domain.name
     h[:status]     = domain.statuses.map { |x| status_map[x] || x }
     h[:registered] = domain.registered_at.try(:to_s, :iso8601)
@@ -120,4 +121,10 @@ class WhoisRecord < ActiveRecord::Base
   def destroy_whois_record
     Whois::Record.where(name: name).delete_all
   end
+
+  private
+
+  def disclaimer_text
+    Setting.registry_whois_disclaimer
+  end
 end
diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb
new file mode 100644
index 000000000..ed9a087f7
--- /dev/null
+++ b/test/models/whois_record_test.rb
@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class WhoisRecordTest < ActiveSupport::TestCase
+  def setup
+    super
+
+    @domain = domains(:shop)
+    @record = WhoisRecord.new(domain: @domain)
+  end
+
+  def test_generated_json_has_expected_values
+
+    expected_disclaimer_text = <<-TEXT.squish
+    Search results may not be used for commercial, advertising, recompilation,
+    repackaging, redistribution, reuse, obscuring or other similar activities.
+    TEXT
+
+    expected_partial_hash = {
+      disclaimer: expected_disclaimer_text,
+      name: 'shop.test',
+      registrant: 'John',
+      registrant_kind: 'priv',
+      email: 'john@inbox.test',
+      expire: '2010-07-05',
+      nameservers: ['ns1.bestnames.test', 'ns2.bestnames.test'],
+      registrar_address: 'Main Street, New York, New York, 12345',
+      dnssec_keys: [],
+    }
+
+    expected_partial_hash.each do |key, value|
+      assert_equal(value, @record.generated_json[key])
+    end
+  end
+end