diff --git a/src/in_fallback.liq b/src/in_fallback.liq
index e9a456304a5479172c3136d9573b3ea157febf5d..a51a6911ecd372c5b91a26b6f319468c42aa9d2e 100644
--- a/src/in_fallback.liq
+++ b/src/in_fallback.liq
@@ -81,7 +81,7 @@ def attach_fallback_source(main_stream) =
           reload_mode="seconds"
         )
 
-      s = amplify(id="fallback_folder", 1., override="replay_gain", 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)
@@ -108,7 +108,7 @@ def attach_fallback_source(main_stream) =
         )
 
       # FIXME: this may be the cause for the fallback to be so loud.
-      s = amplify(id="fallback_playlist", 1., override="replay_gain", 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)
diff --git a/src/in_queue.liq b/src/in_queue.liq
index c09add0dfd502b90a9cf8e8aa31e5c4e2c67872d..a6410b7d49cff3b716def72e28ed367c8b70c6ad 100644
--- a/src/in_queue.liq
+++ b/src/in_queue.liq
@@ -33,15 +33,18 @@ end
 #####################################
 
 # Create Sources
-input_queue_raw_0 = request.queue(id="in_queue_0")
-input_queue_raw_1 = request.queue(id="in_queue_1")
+# input_queue_raw_0 = request.queue(id="in_queue_0")
+# input_queue_raw_1 = request.queue(id="in_queue_1")
+input_queue_0 = request.queue(id="in_queue_0")
+input_queue_1 = request.queue(id="in_queue_1")
+
 
 # Apply ReplayGain normalization, if metadata available
 #FIXME: this causes issues with the volume?
-input_queue_0 =
-  amplify(id="in_queue_0", 1., override="replay_gain", input_queue_raw_0)
-input_queue_1 =
-  amplify(id="in_queue_1", 1., override="replay_gain", input_queue_raw_1)
+# input_queue_0 =
+  # amplify(id="in_queue_0", 1., override="replay_gain", input_queue_raw_0)
+# input_queue_1 =
+  # amplify(id="in_queue_1", 1., override="replay_gain", input_queue_raw_1)
 # See https://github.com/savonet/liquidsoap/discussions/2537
 # input_queue_0 = replaygain(input_queue_0)
 # input_queue_1 = replaygain(input_queue_1)
@@ -64,7 +67,7 @@ server.register(
   fun (s) ->
     begin
       ignore(s)
-      clear_queue(input_queue_raw_0)
+      clear_queue(input_queue_0)
       "OK"
     end
 )
@@ -79,7 +82,7 @@ server.register(
   fun (s) ->
     begin
       ignore(s)
-      clear_queue(input_queue_raw_1)
+      clear_queue(input_queue_1)
       "OK"
     end
 )