diff --git a/CHANGELOG b/CHANGELOG
index a977fc3fdbfa52db04952facc06f6d67cc629e7c..8bd7b388daad085e9bbec5f0288bd45d36c53bd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ v 8.10.0 (unreleased)
   - Exclude email check from the standard health check
   - Updated layout for Projects, Groups, Users on Admin area !4424
   - Fix changing issue state columns in milestone view
+  - Update health_check gem to version 2.1.0
   - Add notification settings dropdown for groups
   - Wildcards for protected branches. !4665
   - Allow importing from Github using Personal Access Tokens. (Eric K Idema)
diff --git a/Gemfile b/Gemfile
index f1fef4caf7643a9a92eb07b81d2372ed79f1840f..5c43015e52c6457e7fd281b6a2acf71fb6a9fc68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -344,7 +344,7 @@ gem 'oauth2', '~> 1.2.0'
 gem 'paranoia', '~> 2.0'
 
 # Health check
-gem 'health_check', '~> 1.5.1'
+gem 'health_check', '~> 2.1.0'
 
 # System information
 gem 'vmstat', '~> 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 721ab9ddc5d2b7cacfd491e31fd0a68b48e3aad5..f8018e58a5e794d6106e0efc3ed0fe6d3bb429a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,8 +322,8 @@ GEM
       thor
       tilt
     hashie (3.4.3)
-    health_check (1.5.1)
-      rails (>= 2.3.0)
+    health_check (2.1.0)
+      rails (>= 4.0)
     hipchat (1.5.2)
       httparty
       mimemagic
@@ -870,7 +870,7 @@ DEPENDENCIES
   grape (~> 0.13.0)
   grape-entity (~> 0.4.2)
   hamlit (~> 2.5)
-  health_check (~> 1.5.1)
+  health_check (~> 2.1.0)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
   httparty (~> 0.13.3)
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
index 6796407d4e64b5427112c36e980674c69c09366f..4c91a61fb4a77ef627873749d912d516410dc947 100644
--- a/config/initializers/health_check.rb
+++ b/config/initializers/health_check.rb
@@ -1,16 +1,3 @@
-# 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']