diff --git a/healthcheck/root.go b/healthcheck/root.go
index 85677cfe..92347747 100644
--- a/healthcheck/root.go
+++ b/healthcheck/root.go
@@ -226,8 +226,13 @@ func (c *Component) RemoveNonConfiguredHealthchecks(oldChecks map[string]bool, n
 
 // MergeLabels merge labels from a base and a map of string
 func MergeLabels(base *Base, new map[string]string) {
-	for k, v := range new {
-		base.Labels[k] = v
+	if new != nil && base.Labels != nil {
+		for k, v := range new {
+			base.Labels[k] = v
+		}
+	}
+	if new != nil && base.Labels == nil {
+		base.Labels = new
 	}
 
 }
diff --git a/healthcheck/root_test.go b/healthcheck/root_test.go
index ddb32416..f0b6e156 100644
--- a/healthcheck/root_test.go
+++ b/healthcheck/root_test.go
@@ -158,3 +158,39 @@ func TestGetCheck(t *testing.T) {
 		t.Fatalf("The healthcheck should be missing, and so GetCheck returns an error")
 	}
 }
+
+func TestMergeLabels(t *testing.T) {
+	b := Base{
+		Labels: nil,
+	}
+	MergeLabels(&b, map[string]string{})
+	if b.Labels == nil {
+		t.Fatalf("Merge failed")
+	}
+	if len(b.Labels) != 0 {
+		t.Fatalf("Merge failed")
+	}
+	b = Base{
+		Labels: map[string]string{},
+	}
+	MergeLabels(&b, nil)
+	if len(b.Labels) != 0 {
+		t.Fatalf("Merge failed")
+	}
+	b = Base{
+		Labels: map[string]string{"a": "b"},
+	}
+	MergeLabels(&b, map[string]string{
+		"foo": "bar",
+	})
+	if len(b.Labels) != 2 {
+		t.Fatalf("Merge failed")
+	}
+	if b.Labels["a"] != "b" {
+		t.Fatalf("Merge failed")
+	}
+	if b.Labels["foo"] != "bar" {
+		t.Fatalf("Merge failed")
+	}
+
+}
diff --git a/http/root.go b/http/root.go
index 9699aa64..9d7c0720 100644
--- a/http/root.go
+++ b/http/root.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/labstack/echo"
@@ -32,6 +33,7 @@ type Component struct {
 	Prometheus       *prometheus.Prometheus
 	requestHistogram *prom.HistogramVec
 	responseCounter  *prom.CounterVec
+	wg               sync.WaitGroup
 }
 
 // New creates a new HTTP component
@@ -107,6 +109,17 @@ func New(logger *zap.Logger, memstore *memorystore.MemoryStore, promComponent *p
 	return &component, nil
 }
 
+// func (c *Component) saveAPIHealthchecks() error {
+// 	if err != nil {
+// 		return errors.Wrap(err, "fail marshal to YAML API healthchecks")
+// 	}
+// 	err = os.WriteFile(c.Config.APIHealthchecksConfigPath, d, 0640)
+// 	if err != nil {
+// 		return errors.Wrapf(err, "fail to write API healthchecks in file %s", c.Config.APIHealthchecksConfigPath)
+// 	}
+// 	return nil
+// }
+
 // Start starts the http server
 func (c *Component) Start() error {
 	address := fmt.Sprintf("%s:%d", c.Config.Host, c.Config.Port)
@@ -121,6 +134,7 @@ func (c *Component) Start() error {
 		return errors.Wrapf(err, "fail to register the Prometheus HTTP request histogram")
 	}
 	go func() {
+		defer c.wg.Done()
 		var err error
 		if c.Config.Cert != "" {
 			c.Logger.Info("TLS enabled")
@@ -138,6 +152,7 @@ func (c *Component) Start() error {
 			os.Exit(2)
 		}
 	}()
+	c.wg.Add(1)
 	// todo: remove this, causes issues in tests
 	time.Sleep(300 * time.Millisecond)
 	return nil
@@ -151,6 +166,7 @@ func (c *Component) Stop() error {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	err := c.Server.Shutdown(ctx)
+	c.wg.Wait()
 	if err != nil {
 		c.Logger.Error(err.Error())
 		return err