diff --git a/internal/test/grpc.go b/internal/test/grpc.go
index 4f927c88c..3b1b91263 100644
--- a/internal/test/grpc.go
+++ b/internal/test/grpc.go
@@ -50,7 +50,6 @@ func (f *GRPCServer) ClientOptions() []option.ClientOption {
 			return f.conn.Dial()
 		})),
 		option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
-		option.WithGRPCDialOption(grpc.WithBlock()),
 		option.WithoutAuthentication(),
 	}
 }
diff --git a/pkg/apiclient/apiclient.go b/pkg/apiclient/apiclient.go
index 70039386b..ba96c4756 100644
--- a/pkg/apiclient/apiclient.go
+++ b/pkg/apiclient/apiclient.go
@@ -10,7 +10,7 @@ type APIClient struct {
 }
 
 func New(target string, opts ...grpc.DialOption) (*APIClient, error) {
-	gclient, err := grpc.Dial(target, opts...)
+	gclient, err := grpc.NewClient(target, opts...)
 	if err != nil {
 		panic("Failed to connect to provider " + err.Error())
 	}