diff --git a/util/proto.go b/util/proto.go
index dc9a4e1440d75..a4f6d73b57df0 100644
--- a/util/proto.go
+++ b/util/proto.go
@@ -23,6 +23,7 @@ func TimeOrNil(ts *timestamppb.Timestamp) *time.Time {
 func PointerSlice[T any](from []T) []*T {
 	var result []*T
 	for _, x := range from {
+		x := x
 		result = append(result, &x)
 	}
 	return result
@@ -63,6 +64,7 @@ func FromPointerMap[K ~string, V any](from map[string]*V) map[K]V {
 func ToPointerMap[K ~string, V any](from map[K]V) map[string]*V {
 	result := make(map[string]*V)
 	for k, v := range from {
+		v := v
 		result[string(k)] = &v
 	}
 	return result