diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
index d1fbd1ed96bec0c79fe529dcc0bee87b989bc7de..925f27242269085c15898b855710678a768efa6f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -92,6 +92,11 @@ export class TimelineView extends Component {
                                 group.push({'id': suDraft.id, title: suDraft.name});
                             }
                             suList.push(suBlueprint);
+                        }   else if (suBlueprint.start_time) {
+                            ScheduleService.getTaskBlueprintsBySchedulingUnit(suBlueprint, true)
+                                .then(tasks => {
+                                    suBlueprint.tasks = tasks;
+                            })
                         }
                     }
                 }
@@ -171,7 +176,6 @@ export class TimelineView extends Component {
             for (const suBlueprint of this.state.suBlueprints) {
                 if (moment.utc(suBlueprint.start_time).isBetween(startTime, endTime) 
                         || moment.utc(suBlueprint.stop_time).isBetween(startTime, endTime)) {
-                    suBlueprintList.push(suBlueprint);
                     let timelineItem = this.getTimelineItem(suBlueprint);
                     if (this.state.stationView) {
                         if (!suBlueprint.tasks) {
@@ -184,6 +188,7 @@ export class TimelineView extends Component {
                             group.push({'id': suBlueprint.suDraft.id, title: suBlueprint.suDraft.name});
                         }
                     }
+                    suBlueprintList.push(suBlueprint);
                 } 
             }
         }   else {