diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index b7ab3074fc95c5b34905e322c37854389ef02e10..0ebb7b58ab6d0e54c7bc91092e02a51df9fadaa8 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -853,13 +853,17 @@ Foam::extendedFeatureEdgeMesh::pointTree() const
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
-        labelList allPoints(identity(points().size()));
+        const labelList featurePointLabels = identity(nonFeatureStart_);
 
         pointTree_.reset
         (
             new indexedOctree<treeDataPoint>
             (
-                treeDataPoint(points()),
+                treeDataPoint
+                (
+                    points(),
+                    featurePointLabels
+                ),
                 bb,     // bb
                 8,      // maxLevel
                 10,     // leafsize