diff --git a/src/engine.liq b/src/engine.liq
index 5a28aeea1a145142e8c2c4469fe22e03215e81bb..ab1be713f533cf8aeec480a68dea8cc5e821e5c9 100644
--- a/src/engine.liq
+++ b/src/engine.liq
@@ -69,58 +69,67 @@ end
 
 # When some regular playout is happening and it is returned to the fallback,
 # we don't want to resume the previous fallback track:
-def on_track_change(s) = 
+def on_track_change(s) =
     source.skip(station_playlist)
     source.skip(station_folder)
 end
 
 
-mixer = mix(id="mixer", 
+mixer = mix(id="mixer",
         list.append(
             [
-                input_filesystem_0, 
-                input_filesystem_1, 
-                input_http_0, 
-                input_http_1, 
-                input_https_0, 
+                input_filesystem_0,
+                input_filesystem_1,
+                input_http_0,
+                input_http_1,
+                input_https_0,
                 input_https_1
-            ], 
+            ],
             !inputs
         )
     )
 
 stripped_stream = strip_blank(
-        id="strip_blank", 
-        track_sensitive=false, 
-        max_blank=fallback_max_blank, 
-        min_noise=fallback_min_noise, 
-        threshold=fallback_threshold, 
+        id="strip_blank",
+        track_sensitive=false,
+        max_blank=fallback_max_blank,
+        min_noise=fallback_min_noise,
+        threshold=fallback_threshold,
         mixer
     )
 
 stripped_stream = on_track(on_track_change, stripped_stream)
 
-fallback_one = fallback(
-    id="fallback-scheduled", 
-    track_sensitive=false,
-    replay_metadata=true,
-    [ stripped_stream, stripped_fallback_mixer])
+# Scheduled fallback is not used, since we replaced it with "default playlists":
 
-fallback_one = on_track(on_track_change, fallback_one)
+# fallback_one = fallback(
+#     id="fallback-scheduled",
+#     track_sensitive=false,
+#     replay_metadata=true,
+#     [ stripped_stream, stripped_fallback_mixer])
 
-fallback_two = fallback(
-    id="fallback-station-playlist", 
+# fallback_one = on_track(on_track_change, fallback_one)
+
+fallback_station_playlist = fallback(
+    id="fallback-station-playlist",
     track_sensitive=false,
     replay_metadata=true,
-    [ fallback_one, station_playlist])
+    [ stripped_stream, station_playlist])
+
+station_folder = mksafe(
+    playlist(id="station_folder",
+    fallback_station_dir,
+    mode="randomize",
+    reload=fallback_station_dir_reload,
+    reload_mode="seconds"))
 
-fallback_three = fallback(
-    id="fallback-station-folder", 
+fallback_station_folder = fallback(
+    id="fallback-station-folder",
     track_sensitive=false,
     replay_metadata=true,
-    [ fallback_two, station_folder])
+    [ fallback_station_playlist, station_folder])
 
-output_source = fallback_three
+output_source = fallback_station_folder
 
 #####################################
 #             OUTPUTS               #
diff --git a/src/in_fallback.liq b/src/in_fallback.liq
index 4d9e31b89c1ef6c94da434140daaddf2725eb6ed..f7c60e2118386a033455b07609daa90b7b3caaa6 100644
--- a/src/in_fallback.liq
+++ b/src/in_fallback.liq
@@ -29,17 +29,17 @@ input_fallback_scheduled_0 = request.equeue(id="in_fallback_scheduled_0")
 input_fallback_scheduled_1 = request.equeue(id="in_fallback_scheduled_1")
 
 station_playlist = playlist(
-    id="station_playlist", 
-    fallback_station_playlist_path, 
-    mode="randomize",    
+    id="station_playlist",
+    fallback_station_playlist_path,
+    mode="randomize",
     reload_mode="watch",
     reload=0)
 
 station_folder = mksafe(
-    playlist(id="station_folder", 
-    fallback_station_dir, 
-    mode="randomize", 
-    reload=fallback_station_dir_reload, 
+    playlist(id="station_folder",
+    fallback_station_dir,
+    mode="randomize",
+    reload=fallback_station_dir_reload,
     reload_mode="seconds"))
 
 # Apply ReplayGain Normalization
@@ -55,22 +55,22 @@ station_playlist = on_metadata(id="station_playlist", on_metadata_notification,
 station_folder = on_metadata(id="station_folder", on_metadata_notification, station_folder)
 
 # Mixer for more control of scheduled fallbacks
-fallback_mixer = mix(id="mixer_fallback", 
+fallback_mixer = mix(id="mixer_fallback",
         list.append(
             [
-                input_fallback_scheduled_0, 
+                input_fallback_scheduled_0,
                 input_fallback_scheduled_1
-            ], 
+            ],
             !fallback_inputs
         )
     )
 
 stripped_fallback_mixer = strip_blank(
-        id="fallback_strip_blank", 
-        track_sensitive=false, 
-        max_blank=fallback_max_blank, 
-        min_noise=fallback_min_noise, 
-        threshold=fallback_threshold, 
+        id="fallback_strip_blank",
+        track_sensitive=false,
+        max_blank=fallback_max_blank,
+        min_noise=fallback_min_noise,
+        threshold=fallback_threshold,
         fallback_mixer
     )
 
@@ -86,11 +86,11 @@ server.register(namespace=source.id(input_fallback_scheduled_0),
         usage="clear",
         "clear",
 
-    fun (s) -> 
+    fun (s) ->
         begin
             source.skip(input_fallback_scheduled_0)
-            clear_queue(input_fallback_scheduled_0) 
-            "Clearing done."     
+            clear_queue(input_fallback_scheduled_0)
+            "Clearing done."
         end
     )
 
@@ -100,11 +100,11 @@ server.register(namespace=source.id(input_fallback_scheduled_1),
         usage="clear",
         "clear",
 
-    fun (s) -> 
+    fun (s) ->
         begin
             source.skip(input_fallback_scheduled_1)
-            clear_queue(input_fallback_scheduled_1) 
-            "Clearing done." 
+            clear_queue(input_fallback_scheduled_1)
+            "Clearing done."
         end
     )
 
@@ -114,7 +114,7 @@ server.register(namespace = source.id(input_fallback_scheduled_0),
     usage = "seek <duration in seconds>",
     "seek",
 
-    fun (t) -> 
+    fun (t) ->
         begin
             log("Seeking #{t} sec")
             t = float_of_string(default=0.,t)
@@ -129,11 +129,11 @@ server.register(namespace = source.id(input_fallback_scheduled_1),
     usage = "seek <duration in seconds>",
     "seek",
 
-    fun (t) -> 
+    fun (t) ->
         begin
             log("Seeking #{t} sec")
             t = float_of_string(default=0.,t)
             ret = source.seek(input_fallback_scheduled_1, t)
             "Seeked #{ret} seconds."
         end
-    )    
\ No newline at end of file
+    )
\ No newline at end of file