diff --git a/common/tls/ech_server.go b/common/tls/ech_server.go
index 00b24fd5..c38fe673 100644
--- a/common/tls/ech_server.go
+++ b/common/tls/ech_server.go
@@ -97,8 +97,12 @@ func (c *echServerConfig) startWatcher() error {
 	if err != nil {
 		return err
 	}
+	err = c.watcher.Start()
+	if err != nil {
+		return err
+	}
 	c.watcher = watcher
-	return c.watcher.Start()
+	return nil
 }
 
 func (c *echServerConfig) credentialsUpdated(path string) error {
diff --git a/common/tls/std_server.go b/common/tls/std_server.go
index 82ea9134..e894dade 100644
--- a/common/tls/std_server.go
+++ b/common/tls/std_server.go
@@ -106,8 +106,12 @@ func (c *STDServerConfig) startWatcher() error {
 	if err != nil {
 		return err
 	}
+	err = c.watcher.Start()
+	if err != nil {
+		return err
+	}
 	c.watcher = watcher
-	return c.watcher.Start()
+	return nil
 }
 
 func (c *STDServerConfig) certificateUpdated(path string) error {