diff --git a/src/in_fallback.liq b/src/in_fallback.liq
index c178cf73320e3ff6d7a5e46ec7fe46e6793da551..c90ba59e2d6143e7e0504c588b6157e20c05280f 100644
--- a/src/in_fallback.liq
+++ b/src/in_fallback.liq
@@ -61,7 +61,8 @@ def attach_fallback_source(main_stream)
 
             s = amplify(id="fallback_folder", 1., override="replay_gain", s)
             # s.on_metadata(on_metadata_notification)
-            s.on_track(on_metadata_notification)
+            # s.on_track(on_metadata_notification)
+            s = source.on_track(id="fallback_folder", s, on_metadata_notification)
             s = mksafe(s)
 
             fallback_folder := s
@@ -80,7 +81,8 @@ def attach_fallback_source(main_stream)
 
             s = amplify(id="fallback_playlist", 1., override="replay_gain", s)
             # s.on_metadata(on_metadata_notification)
-            s.on_track(on_metadata_notification)
+            # s.on_track(on_metadata_notification)
+            s = source.on_track(id="fallback_playlist", s, on_metadata_notification)
             s = mksafe(s)
 
             fallback_playlist := s