diff --git a/modules/liquidsoap/engine.liq b/modules/liquidsoap/engine.liq
index cd083f0320a780bddb6223521651fc06d47961ec..d3d7efed1a9aca843b47532488558d3d90892b97 100644
--- a/modules/liquidsoap/engine.liq
+++ b/modules/liquidsoap/engine.liq
@@ -92,7 +92,7 @@ output_source = fallback(
     id="fallback-scheduled", 
     track_sensitive=false,
     replay_metadata=true,
-    [ stripped_stream, input_fallback_scheduled])
+    [ stripped_stream, fallback_playlist])
 
 output_source = fallback(
     id="fallback-station-playlist", 
diff --git a/modules/liquidsoap/in_filesystem.liq b/modules/liquidsoap/in_filesystem.liq
index 7feda2674ece10b6767f07cd45c8fc1175055441..fae0b2e0dc043a2cf9b1599ec01d5f26404ef0a9 100644
--- a/modules/liquidsoap/in_filesystem.liq
+++ b/modules/liquidsoap/in_filesystem.liq
@@ -47,7 +47,11 @@ input_filesystem_1 = on_metadata(id="in_filesystem_1", on_metadata_notification,
 #         FALLBACK SOURCES          #
 #####################################
 
-input_fallback_scheduled = request.equeue(id="in_fallback_scheduled")
+fallback_playlist = playlist(
+    id="playlist_fallback_scheduled", 
+    "", 
+    mode="normal", 
+    reload_mode="watch")
 
 station_playlist = playlist(
     id="station_playlist", 
@@ -64,12 +68,12 @@ station_folder = mksafe(
     reload_mode="seconds"))
 
 # Apply ReplayGain Normalization
-input_fallback_scheduled = amplify(id="in_fallback_scheduled", 1., override="replay_gain", input_fallback_scheduled)
+fallback_playlist = amplify(id="playlist_fallback_scheduled", 1., override="replay_gain", fallback_playlist)
 station_playlist = amplify(id="station_playlist", 1., override="replay_gain", station_playlist)
 station_folder = amplify(id="station_folder", 1., override="replay_gain", station_folder)
 
 # Add Event Handlers
-input_fallback_scheduled = on_metadata(id="in_fallback_scheduled", on_metadata_notification, input_fallback_scheduled)
+fallback_playlist = on_metadata(id="playlist_fallback_scheduled", on_metadata_notification, fallback_playlist)
 station_playlist = on_metadata(id="station_playlist", on_metadata_notification, station_playlist)
 station_folder = on_metadata(id="station_folder", on_metadata_notification, station_folder)
 
@@ -121,19 +125,6 @@ server.register(namespace=source.id(input_filesystem_1),
         end
     )
 
-# Clear Scheduled Fallback Queue
-server.register(namespace=source.id(input_fallback_scheduled),
-        description="Clear all items of the scheduled fallback queue.",
-        usage="clear",
-        "clear",
-
-    fun (s) -> 
-        begin 
-            clear_queue(input_fallback_scheduled) 
-            "Clearing done." 
-        end
-    )
-
 # Seek Filesystem Queue A
 server.register(namespace = source.id(input_filesystem_0),
     description="seek to relative position in #{source.id(input_filesystem_0)}",