diff --git a/main.go b/main.go
index fc6071e..04c3dca 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2021-2022 Doc.ai its affiliates.
+// Copyright (c) 2021-2023 Doc.ai its affiliates.
+//
+// Copyright (c) 2023 Cisco its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -182,17 +184,12 @@ func main() {
 	log.FromContext(ctx).Infof("executing phase 4: create network service client (time since start: %s)", time.Since(starttime))
 	// ********************************************************************************
 	dialOptions := append(tracing.WithTracingDial(),
-		grpc.WithDefaultCallOptions(
-			grpc.WaitForReady(true),
-			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
-		),
 		grpc.WithTransportCredentials(
-			grpcfd.TransportCredentials(
-				credentials.NewTLS(
-					tlsClientConfig,
-				),
-			),
+			grpcfd.TransportCredentials(credentials.NewTLS(tlsClientConfig)),
 		),
+		grpc.WithBlock(),
+		grpc.WithDefaultCallOptions(
+			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime)))),
 		grpcfd.WithChainStreamInterceptor(),
 		grpcfd.WithChainUnaryInterceptor(),
 	)