diff --git a/main/main.cpp b/main/main.cpp
index ed6a320e4c9..0fb6813c6b6 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2965,19 +2965,14 @@ bool Main::start() {
 		}
 		if (debug_navigation) {
 			sml->set_debug_navigation_hint(true);
+			NavigationServer3D::get_singleton()->set_debug_navigation_enabled(true);
 		}
 		if (debug_avoidance) {
-			sml->set_debug_avoidance_hint(true);
+			NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(true);
 		}
 		if (debug_navigation || debug_avoidance) {
 			NavigationServer3D::get_singleton()->set_active(true);
 			NavigationServer3D::get_singleton()->set_debug_enabled(true);
-			if (debug_navigation) {
-				NavigationServer3D::get_singleton()->set_debug_navigation_enabled(true);
-			}
-			if (debug_avoidance) {
-				NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(true);
-			}
 		}
 #endif
 
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index e071011c48d..9d7e40db576 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -737,14 +737,6 @@ void SceneTree::set_debug_navigation_hint(bool p_enabled) {
 bool SceneTree::is_debugging_navigation_hint() const {
 	return debug_navigation_hint;
 }
-
-void SceneTree::set_debug_avoidance_hint(bool p_enabled) {
-	debug_avoidance_hint = p_enabled;
-}
-
-bool SceneTree::is_debugging_avoidance_hint() const {
-	return debug_avoidance_hint;
-}
 #endif
 
 void SceneTree::set_debug_collisions_color(const Color &p_color) {
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
index 6a21a74a094..452fac7423f 100644
--- a/scene/main/scene_tree.h
+++ b/scene/main/scene_tree.h
@@ -132,7 +132,6 @@ private:
 	bool debug_collisions_hint = false;
 	bool debug_paths_hint = false;
 	bool debug_navigation_hint = false;
-	bool debug_avoidance_hint = false;
 #endif
 	bool paused = false;
 	int root_lock = 0;
@@ -347,9 +346,6 @@ public:
 
 	void set_debug_navigation_hint(bool p_enabled);
 	bool is_debugging_navigation_hint() const;
-
-	void set_debug_avoidance_hint(bool p_enabled);
-	bool is_debugging_avoidance_hint() const;
 #else
 	void set_debug_collisions_hint(bool p_enabled) {}
 	bool is_debugging_collisions_hint() const { return false; }