diff --git a/src/in_fallback.liq b/src/in_fallback.liq
index 61f6f9899645b87550300eb2f78724c93d86e2de..f4e3ce96e129eca85385fc6fc197c28b8fe379f6 100644
--- a/src/in_fallback.liq
+++ b/src/in_fallback.liq
@@ -69,7 +69,8 @@ def attach_fallback_source(main_stream)
                 reload=fallback_station_dir_reload,
                 reload_mode="seconds")
 
-            s = replaygain(s)
+            s = amplify(id="fallback_folder", 1., override="replay_gain", s)
+            # s = replaygain(s)
             s = source.on_track(id="fallback_folder", s, on_fallback_notify)
             s = mksafe(s)
             source.on_leave(s, on_fallback_leave_notify)
@@ -88,7 +89,8 @@ def attach_fallback_source(main_stream)
                 reload_mode="watch",
                 reload=0)
 
-            s = replaygain(s)
+            s = amplify(id="fallback_playlist", 1., override="replay_gain", s)
+            # s = replaygain(s)
             s = source.on_track(id="fallback_playlist", s, on_fallback_notify)
             s = mksafe(s)
             source.on_leave(s, on_fallback_leave_notify)
diff --git a/src/in_queue.liq b/src/in_queue.liq
index d7a6b8b562fcffcb2df2b359607d99f991ff9b08..85653bc19801132d1552eae7362a9909d68a6159 100644
--- a/src/in_queue.liq
+++ b/src/in_queue.liq
@@ -27,8 +27,11 @@ input_filesystem_0 = request.queue(id="in_filesystem_0")
 input_filesystem_1 = request.queue(id="in_filesystem_1")
 
 # Apply ReplayGain normalization, if metadata available
-input_filesystem_0 = replaygain(input_filesystem_0)
-input_filesystem_1 = replaygain(input_filesystem_1)
+input_filesystem_0 = amplify(id="in_filesystem_0", 1., override="replay_gain", input_filesystem_0)
+input_filesystem_1 = amplify(id="in_filesystem_1", 1., override="replay_gain", input_filesystem_1)
+# See https://github.com/savonet/liquidsoap/discussions/2537
+# input_filesystem_0 = replaygain(input_filesystem_0)
+# input_filesystem_1 = replaygain(input_filesystem_1)
 
 # Add Event Handlers
 input_filesystem_0.on_metadata(on_metadata_notification)