diff --git a/go/vt/vtgateproxy/vtgateproxy.go b/go/vt/vtgateproxy/vtgateproxy.go
index 5f4a50c8ea1..5cd0c1d44ea 100644
--- a/go/vt/vtgateproxy/vtgateproxy.go
+++ b/go/vt/vtgateproxy/vtgateproxy.go
@@ -27,6 +27,7 @@ import (
 	"sync"
 
 	"google.golang.org/grpc"
+
 	"vitess.io/vitess/go/sqlescape"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/grpcclient"
@@ -59,8 +60,9 @@ func (proxy *VTGateProxy) getConnection(ctx context.Context, target string) (*vt
 	// If the connection exists, return it
 	proxy.mu.RLock()
 	existingConn := proxy.targetConns[target]
+	proxy.mu.RUnlock()
+
 	if existingConn != nil {
-		proxy.mu.RUnlock()
 		log.V(100).Infof("Reused connection for %v\n", target)
 		return existingConn, nil
 	}
@@ -68,15 +70,18 @@ func (proxy *VTGateProxy) getConnection(ctx context.Context, target string) (*vt
 	// No luck, need to create a new one. Serialize new additions so we don't create multiple
 	// for a given target.
 	log.V(100).Infof("Need to create connection for %v\n", target)
-	proxy.mu.RUnlock()
+
 	proxy.mu.Lock()
+	defer proxy.mu.Unlock()
 
-	// Otherwise create a new connection after dropping the lock, allowing multiple requests to
-	// race to create the conn for now.
-	grpcclient.RegisterGRPCDialOptions(func(opts []grpc.DialOption) ([]grpc.DialOption, error) {
-		return append(opts, grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`)), nil
-	})
+	// Check again in case conn was made between lock acquisitions.
+	existingConn = proxy.targetConns[target]
+	if existingConn != nil {
+		log.V(100).Infof("Reused connection for %v\n", target)
+		return existingConn, nil
+	}
 
+	// Otherwise create a new connection.
 	conn, err := vtgateconn.DialProtocol(ctx, "grpc", target)
 	if err != nil {
 		return nil, err
@@ -84,7 +89,6 @@ func (proxy *VTGateProxy) getConnection(ctx context.Context, target string) (*vt
 
 	log.V(100).Infof("Created new connection for %v\n", target)
 	proxy.targetConns[target] = conn
-	proxy.mu.Unlock()
 
 	return conn, nil
 }
@@ -174,4 +178,8 @@ func (proxy *VTGateProxy) StreamExecute(ctx context.Context, session *vtgateconn
 }
 
 func Init() {
+	log.V(100).Infof("Registering GRPC dial options")
+	grpcclient.RegisterGRPCDialOptions(func(opts []grpc.DialOption) ([]grpc.DialOption, error) {
+		return append(opts, grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`)), nil
+	})
 }
diff --git a/misc/git/pre-commit b/misc/git/pre-commit
index 3dcd5e4092c..9911b54684b 100755
--- a/misc/git/pre-commit
+++ b/misc/git/pre-commit
@@ -9,6 +9,6 @@ if [ -z "$GIT_DIR" ]; then
   GIT_DIR="${DIR}/.."
 fi
 
-for hook in $GIT_DIR/../misc/git/hooks/*; do
-  $hook
-done
+#for hook in $GIT_DIR/../misc/git/hooks/*; do
+ # $hook
+#done