diff --git a/CHANGELOG b/CHANGELOG
index 2c139336b15c02a80beb718646da1fd7d0ef63b2..574871e1e435e3524b2b85e0a2270ea563eb9090 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.10.0 (unreleased)
   - Add Sidekiq queue duration to transaction metrics.
   - Fix MR-auto-close text added to description. !4836
   - Fix pagination when sorting by columns with lots of ties (like priority)
+  - Exclude email check from the standard health check
   - Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
   - Fix user creation with stronger minimum password requirements !4054 (nathan-pmt)
   - Add API endpoint for a group issues !4520 (mahcsig)
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
index 79e2d23ab2eb9fb3071019734e8a8c1604ce6620..6796407d4e64b5427112c36e980674c69c09366f 100644
--- a/config/initializers/health_check.rb
+++ b/config/initializers/health_check.rb
@@ -1,3 +1,17 @@
+# Email forcibly included in the standard checks, but the email health check
+# doesn't support the full range of SMTP options, which can result in failures
+# for valid SMTP configurations.
+# Overwrite the HealthCheck's detection of whether email is configured
+# in order to avoid the email check during standard checks
+module HealthCheck
+  class Utils
+    def self.mailer_configured?
+      false
+    end
+  end
+end
+
 HealthCheck.setup do |config|
   config.standard_checks = ['database', 'migrations', 'cache']
+  config.full_checks = ['database', 'migrations', 'cache']
 end