diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab432d3f..e1dfeae01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - OAuth form improvements: users are remembered by their cookie, the CSS is overridable by the admin, and the style has been improved.
 - OAuth improvements and fixes: more secure session-based authentication (by token that could be revoked anytime), ability to revoke belonging OAuth token from any client etc.
 - Ability to set ActivityPub aliases for follower migration.
-- Configurable background job limits for RichMedia (link previews) and MediaProxy
+- Configurable background job limits for RichMedia (link previews) and MediaProxyWarmingPolicy
 
 
 <details>
diff --git a/config/config.exs b/config/config.exs
index e07e67de9..c4a690799 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -834,7 +834,7 @@
 
 config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
-  {Pleroma.Web.MediaProxy, [max_running: 5, max_waiting: 5]}
+  {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
 # Import environment specific config. This must remain at the bottom