diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index c41f5cd6b..14e158ec0 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -99,6 +99,7 @@
           = render 'setting_row', var: :registry_state
           = render 'setting_row', var: :registry_zip
           = render 'setting_row', var: :registry_country_code
+          = render 'setting_row', var: :registry_whois_disclaimer
 
   .row
     .col-md-12.text-right
diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index 5ae521bc5..b6efea6eb 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -72,4 +72,5 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:registry_bank_code, '689')
   Setting.save_default(:registry_swift, 'LHVBEE22')
   Setting.save_default(:registry_invoice_contact, 'Martti Õigus')
+  Setting.save_default(:registry_whois_disclaimer, 'Search results may not be used for commercial, advertising, recompilation, repackaging, redistribution, reuse, obscuring or other similar activities.')
 end