diff --git a/lib/smtp_configuration.rb b/lib/smtp_configuration.rb
index 8199341032dc..1927e7df576f 100644
--- a/lib/smtp_configuration.rb
+++ b/lib/smtp_configuration.rb
@@ -1,6 +1,6 @@
 class SmtpConfiguration
   def self.set_configuration
-    if (Rails.env.production? || Rails.env.staging? || Rails.env.preproduction?) && Setting[:smtp_configuration]
+    if (Rails.env.production? || Rails.env.staging? || Rails.env.preproduction?) && Setting["feature.smtp_configuration"].present?
       ActionMailer::Base.delivery_method = :smtp
       ActionMailer::Base.smtp_settings = {
         address:              Setting["smtp.address"],