diff --git a/src/models.py b/src/models.py
index b3023e78c15d5961e766673b428a3602e76bd34d..43f3497a06bb325ced317b2a087fbc9b5cceb04d 100644
--- a/src/models.py
+++ b/src/models.py
@@ -436,9 +436,9 @@ class ClockInfo(db.Model):
                 info["current_track"] = track_schema.dump(current_track)
             if data.current_playlist:
                 info["planned_playlist"] = json.loads(data.current_playlist)                
-                current_playlist_id = data.current_playlist.playlist_id
-                for next_entry in data.current_playlist.entries:
-                    if next_entry.start_date > datetime.now():                        
+                current_playlist_id = info["planned_playlist"]["playlist_id"]
+                for next_entry in info["planned_playlist"]["entries"]:
+                    if next_entry.get("start_date") and next_entry.get("start_date") > datetime.datetime.now():                        
                         updated_playlist["entries"].append(next_entry)
                 
             if data.current_timeslot:
@@ -474,6 +474,7 @@ class ClockInfoSchema(ma.SQLAlchemySchema):
             "log_source",
             "log_time",
             "current_track",
+            "planned_playlist",
             "current_playlist",
             "current_timeslot",
             "next_timeslot"