diff --git a/config/initializers/100-push-notifications.rb b/config/initializers/100-push-notifications.rb
index 54e6a62010c..8cb0542cab8 100644
--- a/config/initializers/100-push-notifications.rb
+++ b/config/initializers/100-push-notifications.rb
@@ -1,6 +1,6 @@
 require_dependency 'webpush'
 
-if SiteSetting.vapid_public_key.blank? || SiteSetting.vapid_private_key.blank?
+if SiteSetting.vapid_public_key.blank? || SiteSetting.vapid_private_key.blank? || SiteSetting.vapid_public_key_bytes.blank?
   vapid_key = Webpush.generate_key
   SiteSetting.vapid_public_key = vapid_key.public_key
   SiteSetting.vapid_private_key = vapid_key.private_key