diff --git a/util/grpcerrors/grpcerrors.go b/util/grpcerrors/grpcerrors.go
index f52f18673ee6b..cbbc1e946744b 100644
--- a/util/grpcerrors/grpcerrors.go
+++ b/util/grpcerrors/grpcerrors.go
@@ -42,6 +42,12 @@ func ToGRPC(err error) error {
 		st = status.FromProto(pb)
 	}
 
+	if err.Error() != st.Message() {
+		pb := st.Proto()
+		pb.Message = err.Error()
+		st = status.FromProto(pb)
+	}
+
 	var details []proto.Message
 
 	for _, st := range stack.Traces(err) {