1 files changed, 5 insertions, 3 deletions
diff --git a/src/scripts/controllers/simulation/statecache.ts b/src/scripts/controllers/simulation/statecache.ts
index 6d34dc03..06dbd424 100644
--- a/src/scripts/controllers/simulation/statecache.ts
+++ b/src/scripts/controllers/simulation/statecache.ts
@@ -84,8 +84,6 @@ export class StateCache {
             this.fetchAllAvailableStates().then((data) => {
                 this.stateList = data;
 
-                this.updateTasks(tick);
-
                 // Determine last cached tick
                 let ticks = Object.keys(this.stateList).sort((a, b) => {
                     return parseInt(a) - parseInt(b);
@@ -94,6 +92,10 @@ export class StateCache {
                     this.lastCachedTick = parseInt(ticks[ticks.length - 1]);
                 }
 
+                for (let i = 1; i <= this.lastCachedTick; i++) {
+                    this.updateTasksForNewTick(i);
+                }
+
                 // Update chart cache
                 this.simulationController.chartController.tickUpdated(tick);
 
@@ -111,7 +113,7 @@ export class StateCache {
         });
     }
 
-    private updateTasks(tick: number): void {
+    private updateTasksForNewTick(tick: number): void {
         const taskIDsInTick = [];
 
         this.stateList[tick].taskStates.forEach((taskState: ITaskState) => {