diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 3fa11ca23ba..8ea79430c92 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -275,16 +275,11 @@ module SiteSettingExtension
     end
   end
 
-  SECRET_SETTINGS ||= %w{
-    google_oauth2_client_secret twitter_consumer_secret instagram_consumer_secret
-    facebook_app_secret github_client_secret s3_secret_access_key
-  }
-
   def set_and_log(name, value, user = Discourse.system_user)
     prev_value = send(name)
     set(name, value)
     if has_setting?(name)
-      value = prev_value = "[FILTERED]" if SECRET_SETTINGS.include?(name)
+      value = prev_value = "[FILTERED]" if name.to_s =~ /_secret/
       StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value)
     end
   end