diff --git a/cmd/icingadb/main.go b/cmd/icingadb/main.go
index eaea1d84..239455ac 100644
--- a/cmd/icingadb/main.go
+++ b/cmd/icingadb/main.go
@@ -115,6 +115,14 @@ func run() int {
 	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP)
 
+	go func() {
+		logger.Info("Starting history sync")
+
+		if err := hs.Sync(ctx); err != nil && !utils.IsContextCanceled(err) {
+			logger.Fatalf("%+v", err)
+		}
+	}()
+
 	// Main loop
 	for {
 		hactx, cancelHactx := context.WithCancel(ctx)
@@ -158,12 +166,6 @@ func run() int {
 							}
 						})
 
-						g.Go(func() error {
-							logger.Info("Starting history sync")
-
-							return hs.Sync(synctx)
-						})
-
 						g.Go(func() error {
 							logger.Info("Starting overdue sync")