diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
index f05279de402..f5676043fff 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
@@ -382,6 +382,17 @@ struct EraseOperationExecutor {
     float factor;
     bool is_src_point;
     bool is_cut;
+
+    /**
+     * Source point is the last of the curve.
+     */
+    bool is_src_end_point() const
+    {
+      /* The src_next_point index increments for all points except the last, where it is set to the
+       * first point index. This can be used to detect the curve end from the source index alone.
+       */
+      return is_src_point && src_point >= src_next_point;
+    }
   };
 
   /**
@@ -547,18 +558,16 @@ struct EraseOperationExecutor {
       threading::parallel_for(dst.curves_range(), 4096, [&](const IndexRange dst_curves) {
         for (const int dst_curve : dst_curves) {
           const IndexRange dst_curve_points = dst_points_by_curve[dst_curve];
-          if (dst_transfer_data[dst_curve_points.first()].is_cut) {
+          const PointTransferData &start_point_transfer =
+              dst_transfer_data[dst_curve_points.first()];
+          const PointTransferData &end_point_transfer = dst_transfer_data[dst_curve_points.last()];
+
+          if (start_point_transfer.is_cut) {
             dst_start_caps.span[dst_curve] = GP_STROKE_CAP_TYPE_FLAT;
           }
-
-          if (dst_curve == dst_curves.last()) {
-            continue;
-          }
-
-          const PointTransferData &next_point_transfer =
-              dst_transfer_data[dst_points_by_curve[dst_curve + 1].first()];
-
-          if (next_point_transfer.is_cut) {
+          /* The is_cut flag does not work for end points, but any end point that isn't the source
+           * point must also be a cut. */
+          if (!end_point_transfer.is_src_end_point()) {
             dst_end_caps.span[dst_curve] = GP_STROKE_CAP_TYPE_FLAT;
           }
         }