diff --git a/config/environments/production.rb b/config/environments/production.rb
index 48b134949..dc5319535 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -104,7 +104,7 @@ Rails.application.configure do
   enable_starttls = nil
   enable_starttls_auto = nil
 
-  case env['SMTP_ENABLE_STARTTLS']
+  case ENV['SMTP_ENABLE_STARTTLS']
   when 'always'
     enable_starttls = true
   when 'never'
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 76089ebac..3ec685c74 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -326,7 +326,7 @@ namespace :mastodon do
           when 'auto'
             enable_starttls_auto = true
           else
-            enable_starttls_auto = ENV['SMTP_ENABLE_STARTTLS_AUTO'] != 'false'
+            enable_starttls_auto = env['SMTP_ENABLE_STARTTLS_AUTO'] != 'false'
           end
 
           ActionMailer::Base.smtp_settings = {