diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index 55c5d705..cc0cf04f 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -3970,15 +3970,10 @@ func runInitEs(ctx context.Context) {
 		log.Printf("[WARNING] Failed getting schedules during service init: %s", err)
 	} else {
 		log.Printf("[INFO] Setting up %d schedule(s)", len(schedules))
-		url := &url.URL{}
-		for _, schedule := range schedules {
-			if schedule.Environment == "cloud" {
-				log.Printf("Skipping cloud schedule")
-				continue
-			}
 
-			//log.Printf("Schedule: %#v", schedule)
-			job := func() {
+		url := &url.URL{}
+		job := func(schedule ScheduleOld) func() {
+			return func() {
 				//log.Printf("[INFO] Running schedule %s with interval %d.", schedule.Id, schedule.Seconds)
 				//log.Printf("ARG: %s", schedule.WrappedArgument)
 
@@ -3993,9 +3988,18 @@ func runInitEs(ctx context.Context) {
 					log.Printf("[WARNING] Failed to execute %s: %s", schedule.WorkflowId, err)
 				}
 			}
+		}
+
+		for _, schedule := range schedules {
+			if schedule.Environment == "cloud" {
+				log.Printf("Skipping cloud schedule")
+				continue
+			}
+
+			//log.Printf("Schedule: %#v", schedule)
 
 			//log.Printf("Schedule time: every %d seconds", schedule.Seconds)
-			jobret, err := newscheduler.Every(schedule.Seconds).Seconds().NotImmediately().Run(job)
+			jobret, err := newscheduler.Every(schedule.Seconds).Seconds().NotImmediately().Run(job(schedule))
 			if err != nil {
 				log.Printf("Failed to schedule workflow: %s", err)
 			}