diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
index 8d7ebb4e105..81608271d5b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
@@ -123,7 +123,7 @@ class CornersOfVertInput final : public bke::MeshFieldInput {
           corner_of_vertex[selection_i] = corner_indices[sort_indices[index_in_sort_wrapped]];
         }
         else {
-          corner_of_vertex[selection_i] = corner_indices[index_in_sort_wrapped];
+          corner_of_vertex[selection_i] = corners[index_in_sort_wrapped];
         }
       }
     });
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
index 7c27a4b783d..8fd1ffa5148 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
@@ -124,7 +124,7 @@ class EdgesOfVertInput final : public bke::MeshFieldInput {
           edge_of_vertex[selection_i] = edge_indices[sort_indices[index_in_sort_wrapped]];
         }
         else {
-          edge_of_vertex[selection_i] = edge_indices[index_in_sort_wrapped];
+          edge_of_vertex[selection_i] = edges[index_in_sort_wrapped];
         }
       }
     });