diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go
index e7c8491eb..b10eebd9e 100644
--- a/abci/client/grpc_client.go
+++ b/abci/client/grpc_client.go
@@ -132,11 +132,11 @@ func (cli *grpcClient) OnStop() {
 }
 
 func (cli *grpcClient) StopForError(err error) {
-	cli.mtx.Lock()
 	if !cli.IsRunning() {
 		return
 	}
 
+	cli.mtx.Lock()
 	if cli.err == nil {
 		cli.err = err
 	}