diff --git a/.env.example b/.env.example
index a44111c0..9bce6ab7 100644
--- a/.env.example
+++ b/.env.example
@@ -15,7 +15,7 @@ SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_TLS_ENABLED=true
 
-# Email Configuration
+# Address that emails are sent from
 EMAIL_SENDER=
 
 # Database Configuration
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 47cdc622..9305dad1 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,3 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
+  default from: ENV["EMAIL_SENDER"] if ENV["EMAIL_SENDER"].present?
   layout "mailer"
 end