diff --git a/cmd/daemon/serve.go b/cmd/daemon/serve.go
index 52513e1fb53c..a952448af803 100644
--- a/cmd/daemon/serve.go
+++ b/cmd/daemon/serve.go
@@ -296,8 +296,9 @@ func bgTasks(d driver.Registry, cmd *cobra.Command, args []string, slOpts *servi
 	ctx := modifiers.ctx
 
 	if d.Config().IsBackgroundCourierEnabled(ctx) {
-		go courier.Watch(ctx, d)
+		return courier.Watch(ctx, d)
 	}
+
 	return nil
 }