diff --git a/goKMS/kms/peers/kmsPeer.go b/goKMS/kms/peers/kmsPeer.go
index 88a3f71241a0cbf44557351b2e8ad997cd157aee..bf1c67801ed7d3c5777db1efcdc25229dcdf614d 100644
--- a/goKMS/kms/peers/kmsPeer.go
+++ b/goKMS/kms/peers/kmsPeer.go
@@ -116,7 +116,6 @@ func NewKmsPeer(peerKmsId string, quantummodule QuantumModule, cryptoAlgorithm c
 }
 
 func (kp *KmsPeer) initializeHealthCheck(remoteConn *grpc.ClientConn) {
-	timeout := time.Second * 5
 	defer func() {
 		if err := remoteConn.Close(); err != nil {
 			log.Errorf("Failed to close health check connection, for peer: %s; err: %v", kp.peerKmsId, err)
@@ -126,7 +125,7 @@ func (kp *KmsPeer) initializeHealthCheck(remoteConn *grpc.ClientConn) {
 	healthClient := healthpb.NewHealthClient(remoteConn)
 	// TODO: add option to cancel
 	for range time.Tick(time.Second) {
-		ctx, cancel := context.WithTimeout(context.Background(), timeout)
+		ctx, cancel := context.WithTimeout(context.Background(), kp.gRPCTimeout)
 		resp, err := healthClient.Check(ctx, &healthpb.HealthCheckRequest{Service: ""})
 		cancel()
 		if err != nil {
@@ -140,7 +139,7 @@ func (kp *KmsPeer) initializeHealthCheck(remoteConn *grpc.ClientConn) {
 				}
 				break
 			} else if stat, ok := status.FromError(err); ok && stat.Code() == codes.DeadlineExceeded {
-				log.Printf("health request for peer: %s timed out after %d seconds", kp.peerKmsId, timeout)
+				log.Printf("health request for peer: %s timed out after %d seconds", kp.peerKmsId, kp.gRPCTimeout)
 				if kp.peerStatus != KmsPeerDown {
 					kp.peerStatus = KmsPeerDown
 					if err := kp.eventBus.Publish(event.NewPeerEvent(kp.TcpSocketStr)); err != nil {