diff --git a/cmd/flamenco-worker/main.go b/cmd/flamenco-worker/main.go
index ec8cceb2..e7e4eb47 100644
--- a/cmd/flamenco-worker/main.go
+++ b/cmd/flamenco-worker/main.go
@@ -94,7 +94,8 @@ func main() {
 
 	timeService := clock.New()
 	buffer = upstreamBufferOrDie(client, timeService)
-	go buffer.Flush(workerCtx) // Immediately try to flush any updates.
+	// Flush any updates before actually starting the Worker.
+	buffer.Flush(workerCtx)
 
 	cliRunner := worker.NewCLIRunner()
 	listener = worker.NewListener(client, buffer)