1 files changed, 3 insertions, 1 deletions
diff --git a/lib/banzai/filter/asset_proxy_filter.rb b/lib/banzai/filter/asset_proxy_filter.rb
index 55dc426edaf..4c14ee7299b 100644
--- a/lib/banzai/filter/asset_proxy_filter.rb
+++ b/lib/banzai/filter/asset_proxy_filter.rb
@@ -59,7 +59,9 @@ module Banzai
       end
 
       def self.determine_allowlist(application_settings)
-        application_settings.asset_proxy_whitelist.presence || [Gitlab.config.gitlab.host]
+        application_settings.try(:asset_proxy_allowlist).presence ||
+          application_settings.try(:asset_proxy_whitelist).presence ||
+          [Gitlab.config.gitlab.host]
       end
     end
   end