diff --git a/doc/classes/NavigationMesh.xml b/doc/classes/NavigationMesh.xml
index 3a20a5396..20ebf4371 100644
--- a/doc/classes/NavigationMesh.xml
+++ b/doc/classes/NavigationMesh.xml
@@ -117,8 +117,8 @@
 		<member name="edge_max_error" type="float" setter="set_edge_max_error" getter="get_edge_max_error" default="1.3">
 			The maximum distance a simplfied contour's border edges should deviate the original raw contour.
 		</member>
-		<member name="edge_max_length" type="float" setter="set_edge_max_length" getter="get_edge_max_length" default="12.0">
-			The maximum allowed length for contour edges along the border of the mesh.
+		<member name="edge_max_length" type="float" setter="set_edge_max_length" getter="get_edge_max_length" default="0.0">
+			The maximum allowed length for contour edges along the border of the mesh.  A value of [code]0.0[/code] disables this feature.
 			[b]Note:[/b] While baking, this value will be rounded up to the nearest multiple of [member cell_size].
 		</member>
 		<member name="filter_baking_aabb" type="AABB" setter="set_filter_baking_aabb" getter="get_filter_baking_aabb" default="AABB( 0, 0, 0, 0, 0, 0 )">
diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation_mesh.cpp
index b1a543b4b..9adabc885 100644
--- a/scene/resources/navigation_mesh.cpp
+++ b/scene/resources/navigation_mesh.cpp
@@ -649,7 +649,7 @@ NavigationMesh::NavigationMesh() {
 	agent_max_slope = 45.0f;
 	region_min_size = 2.0f;
 	region_merge_size = 20.0f;
-	edge_max_length = 12.0f;
+	edge_max_length = 0.0f;
 	edge_max_error = 1.3f;
 	verts_per_poly = 6.0f;
 	detail_sample_distance = 6.0f;