diff --git a/config/application.rb b/config/application.rb
index 109fa4d1b..f366f084b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,6 +10,7 @@ require 'sprockets/railtie'
 require 'csv'
 require 'rails/all'
 # require "rails/test_unit/railtie"
+require_relative '../lib/registry_log_formatter'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -78,6 +79,8 @@ module Registry
       domain:               ENV['smtp_domain'],
       openssl_verify_mode:  ENV['smtp_openssl_verify_mode']
     }
+
+    config.log_formatter = RegistryLogFormatter.new # Only works if placed in application.rb
   end
 end
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0c8989a3b..e0f14e1ea 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -75,9 +75,6 @@ Rails.application.configure do
   # Disable automatic flushing of the log to improve performance.
   # config.autoflush_log = false
 
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end
diff --git a/lib/registry_log_formatter.rb b/lib/registry_log_formatter.rb
new file mode 100644
index 000000000..4ce229156
--- /dev/null
+++ b/lib/registry_log_formatter.rb
@@ -0,0 +1,13 @@
+class RegistryLogFormatter < ::Logger::Formatter
+  def call(severity, timestamp, progname, msg)
+    msg = filter_epp_legal_document(msg)
+    "#{msg}\n"
+  end
+
+  private
+
+  def filter_epp_legal_document(msg)
+    msg.gsub(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/,
+             "<eis:legalDocument>[FILTERED]</eis:legalDocument>")
+  end
+end