diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb
index 8567180a12..2ff0e7907d 100644
--- a/config/initializers/vapid.rb
+++ b/config/initializers/vapid.rb
@@ -1,4 +1,5 @@
 Rails.application.configure do
   config.x.vapid.private_key = ENV["VAPID_PRIVATE_KEY"]
   config.x.vapid.public_key = ENV["VAPID_PUBLIC_KEY"]
+  config.x.vapid.subject = ENV.fetch("VAPID_SUBJECT") { config.x.vapid.subject || "mailto:support@fizzy.do" }
 end
diff --git a/lib/web_push/notification.rb b/lib/web_push/notification.rb
index 0d2e54c8d7..0e839c2921 100644
--- a/lib/web_push/notification.rb
+++ b/lib/web_push/notification.rb
@@ -15,8 +15,7 @@ def deliver(connection: nil)
 
   private
     def vapid_identification
-      { subject: "mailto:support@fizzy.do" }.merge \
-        Rails.configuration.x.vapid.symbolize_keys
+      Rails.configuration.x.vapid.symbolize_keys
     end
 
     def encoded_message