diff --git a/source/blender/geometry/GEO_mesh_primitive_cuboid.hh b/source/blender/geometry/GEO_mesh_primitive_cuboid.hh
index bdc3c26a67a..57481b9f5d7 100644
--- a/source/blender/geometry/GEO_mesh_primitive_cuboid.hh
+++ b/source/blender/geometry/GEO_mesh_primitive_cuboid.hh
@@ -13,11 +13,8 @@ struct Mesh;
 
 namespace blender::geometry {
 
-Mesh *create_cuboid_mesh(const float3 &size,
-                         int verts_x,
-                         int verts_y,
-                         int verts_z,
-                         const std::optional<StringRef> &uv_id);
+Mesh *create_cuboid_mesh(
+    const float3 &size, int verts_x, int verts_y, int verts_z, std::optional<StringRef> uv_id);
 
 Mesh *create_cuboid_mesh(const float3 &size, int verts_x, int verts_y, int verts_z);
 
diff --git a/source/blender/geometry/GEO_mesh_primitive_grid.hh b/source/blender/geometry/GEO_mesh_primitive_grid.hh
index 102f36e89d1..198ce656a0d 100644
--- a/source/blender/geometry/GEO_mesh_primitive_grid.hh
+++ b/source/blender/geometry/GEO_mesh_primitive_grid.hh
@@ -12,10 +12,7 @@ struct Mesh;
 
 namespace blender::geometry {
 
-Mesh *create_grid_mesh(int verts_x,
-                       int verts_y,
-                       float size_x,
-                       float size_y,
-                       const std::optional<StringRef> &uv_map_id);
+Mesh *create_grid_mesh(
+    int verts_x, int verts_y, float size_x, float size_y, std::optional<StringRef> uv_map_id);
 
 }  // namespace blender::geometry
diff --git a/source/blender/geometry/GEO_mesh_primitive_uv_sphere.hh b/source/blender/geometry/GEO_mesh_primitive_uv_sphere.hh
index 7431dd9efb0..6b573274fed 100644
--- a/source/blender/geometry/GEO_mesh_primitive_uv_sphere.hh
+++ b/source/blender/geometry/GEO_mesh_primitive_uv_sphere.hh
@@ -26,6 +26,6 @@ Bounds<float3> calculate_bounds_radial_primitive(float radius_top,
 Mesh *create_uv_sphere_mesh(float radius,
                             int segments,
                             int rings,
-                            const std::optional<StringRef> &uv_map_id);
+                            std::optional<StringRef> uv_map_id);
 
 }  // namespace blender::geometry
diff --git a/source/blender/geometry/intern/mesh_primitive_cuboid.cc b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
index 9ba8590c882..90279435a9a 100644
--- a/source/blender/geometry/intern/mesh_primitive_cuboid.cc
+++ b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
@@ -369,7 +369,7 @@ Mesh *create_cuboid_mesh(const float3 &size,
                          const int verts_x,
                          const int verts_y,
                          const int verts_z,
-                         const std::optional<StringRef> &uv_id)
+                         const std::optional<StringRef> uv_id)
 {
   const CuboidConfig config(size, verts_x, verts_y, verts_z);
 
diff --git a/source/blender/geometry/intern/mesh_primitive_grid.cc b/source/blender/geometry/intern/mesh_primitive_grid.cc
index e0597e03a6c..730b276ef39 100644
--- a/source/blender/geometry/intern/mesh_primitive_grid.cc
+++ b/source/blender/geometry/intern/mesh_primitive_grid.cc
@@ -41,7 +41,7 @@ Mesh *create_grid_mesh(const int verts_x,
                        const int verts_y,
                        const float size_x,
                        const float size_y,
-                       const std::optional<StringRef> &uv_map_id)
+                       const std::optional<StringRef> uv_map_id)
 {
   BLI_assert(verts_x > 0 && verts_y > 0);
   const int edges_x = verts_x - 1;
diff --git a/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc b/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
index 29dae4447fa..bc5926742de 100644
--- a/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
+++ b/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
@@ -298,7 +298,7 @@ static Bounds<float3> calculate_bounds_uv_sphere(const float radius,
 Mesh *create_uv_sphere_mesh(const float radius,
                             const int segments,
                             const int rings,
-                            const std::optional<StringRef> &uv_map_id)
+                            const std::optional<StringRef> uv_map_id)
 {
   Mesh *mesh = BKE_mesh_new_nomain(sphere_vert_total(segments, rings),
                                    sphere_edge_total(segments, rings),