diff --git a/config/application.rb b/config/application.rb
index 6d9901e2b..40a9875ab 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,6 +14,8 @@ require 'action_view/railtie'
 # require "action_cable/engine"
 # require "rails/test_unit/railtie"
 
+require 'datadog/auto_instrument' if ENV['DD_TRACE_ENABLED'] == 'true'
+
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb
index 8464af135..b9df5c7e9 100644
--- a/config/initializers/datadog.rb
+++ b/config/initializers/datadog.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 if ENV['DD_TRACE_ENABLED'] == 'true'
-  require 'datadog/auto_instrument'
-
   Datadog.configure do |config|
-    config.tracing.enabled = ENV['DD_TRACE_ENABLED'] == 'true'
+    config.tracing.enabled = true
+    config.tracing.instrument :action_cable, enabled: false
+    config.tracing.instrument :action_mailer, enabled: false
+    config.tracing.instrument :pg, enabled: false
   end
 end