diff --git a/server/grpc/grpc.go b/server/grpc/grpc.go
index 86025a9d..4dcd6d73 100644
--- a/server/grpc/grpc.go
+++ b/server/grpc/grpc.go
@@ -815,7 +815,9 @@ func (g *grpcServer) Stop() error {
 	var err error
 	select {
 	case err = <-ch:
+		g.Lock()
 		g.started = false
+		g.Unlock()
 	}
 
 	return err
diff --git a/server/rpc_server.go b/server/rpc_server.go
index 4b825a8b..c02b893a 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -739,7 +739,9 @@ func (s *rpcServer) Stop() error {
 	var err error
 	select {
 	case err = <-ch:
+		s.Lock()
 		s.started = false
+		s.Unlock()
 	}
 
 	return err