diff --git a/modules/scheduling/calender_fetcher.py b/modules/scheduling/calender_fetcher.py
index 0d54a13aee360ca75815fbff5ee82a75427b3b47..aa8c42934ecfde537fd794d94f1b30db99828663 100644
--- a/modules/scheduling/calender_fetcher.py
+++ b/modules/scheduling/calender_fetcher.py
@@ -106,7 +106,11 @@ class CalendarFetcher:
                 if "end" not in schedule:
                     self.logger.warning("No end of schedule given. Skipping schedule: " + str(schedule))
                     schedule = None
-                if "playlist" not in schedule:
+                if "playlist" not in schedule \
+                    and "show_fallback" not in schedule \
+                    and "schedule_fallback" not in schedule \
+                    and "station_fallback" not in schedule:
+                    
                     self.logger.warning("No playlist for schedule given. Skipping schedule: " + str(schedule))
                     schedule = None
 
@@ -207,7 +211,8 @@ class CalendarFetcher:
 
                 # If Steering doesn't provide a station fallback, the local one is used
                 if not schedule["station_fallback"] and int(local_station_fallback_id) > 0:
-                    schedule["station_fallback"]  = self.__fetch_schedule_playlist__(schedule, local_station_fallback_id, fetched_entries)
+                    schedule["station_fallback_id"] = local_station_fallback_id 
+                    schedule["station_fallback"] = self.__fetch_schedule_playlist__(schedule, local_station_fallback_id, fetched_entries)
                     if schedule["station_fallback"]:
                         self.logger.info("Assigned playlist #%s as local station fallback" % local_station_fallback_id)