diff --git a/pkg/common/discoveryregister/etcd/etcd.go b/pkg/common/discoveryregister/etcd/etcd.go
index 51fafd0b6..eb7e6ac8b 100644
--- a/pkg/common/discoveryregister/etcd/etcd.go
+++ b/pkg/common/discoveryregister/etcd/etcd.go
@@ -193,12 +193,14 @@ func Check(ctx context.Context, etcdServers []string, etcdRoot string, createIfN
 	}
 	defer client.Close()
 
-	// Create a child context with a default timeout or use the provided context
-	opCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
+	if cfg.DialTimeout != 0 {
+		ctx, _ = context.WithTimeout(ctx, cfg.DialTimeout)
+	} else {
+		ctx, _ = context.WithTimeout(ctx, 10*time.Second)
+	}
 
 	// Check if the root node exists
-	resp, err := client.Get(opCtx, etcdRoot)
+	resp, err := client.Get(ctx, etcdRoot)
 	if err != nil {
 		return errors.Wrap(err, "failed to get the root node from etcd")
 	}
@@ -206,7 +208,7 @@ func Check(ctx context.Context, etcdServers []string, etcdRoot string, createIfN
 	// If root node does not exist and createIfNotExist is true, create the root node
 	if len(resp.Kvs) == 0 {
 		if createIfNotExist {
-			_, err := client.Put(opCtx, etcdRoot, "")
+			_, err := client.Put(ctx, etcdRoot, "")
 			if err != nil {
 				return errors.Wrap(err, "failed to create the root node in etcd")
 			}
diff --git a/tools/check-component/main.go b/tools/check-component/main.go
index 5a936f775..5d4435e26 100644
--- a/tools/check-component/main.go
+++ b/tools/check-component/main.go
@@ -45,22 +45,11 @@ func CheckZookeeper(ctx context.Context, config *config.ZooKeeper) error {
 }
 
 func CheckEtcd(ctx context.Context, config *config.Etcd) error {
-	etcd.Check(ctx, config.Address, "/check_openim_component",
+	return etcd.Check(ctx, config.Address, "/check_openim_component",
 		true,
 		etcd.WithDialTimeout(10*time.Second),
 		etcd.WithMaxCallSendMsgSize(20*1024*1024),
 		etcd.WithUsernameAndPassword(config.Username, config.Password))
-	return nil
-}
-
-func CheckDiscovery(ctx context.Context, config *config.Discovery) error {
-	switch config.Enable {
-	case "etcd":
-		return CheckEtcd(ctx, &config.Etcd)
-
-	}
-
-	return nil
 }
 
 func CheckMongo(ctx context.Context, config *config.Mongo) error {