diff --git a/local_planner/include/local_planner/local_planner.h b/local_planner/include/local_planner/local_planner.h
index 2a1e3b4cb..0cf1bdc49 100644
--- a/local_planner/include/local_planner/local_planner.h
+++ b/local_planner/include/local_planner/local_planner.h
@@ -88,6 +88,28 @@ class LocalPlanner {
   **/
   void generateHistogramImage(Histogram& histogram);
 
+  /**
+  * @brief     compute the maximum speed allowed based on sensor range and vehicle tuning
+  * @param     jerk, vehicle maximum jerk
+  * @param     accel, vehicle maximum horizontal acceleration
+  * @param     braking_distance, maximum sensor range
+  * @returns   maximum speed
+  **/
+  float computeMaxSpeedFromBrakingDistance(const float jerk, const float accel, const float braking_distance) const;
+
+  /**
+  * @brief     compute if the cruise speed requested by paramters or mission item is feasible based on vehicle dynamics
+  *and sesnor range
+  * @param     jerk, vehicle maximum jerk
+  * @param     accel, vehicle maximum horizontal acceleration
+  * @param     braking_distance, maximum sensor range
+  * @param     mpc_xy_cruise, desired speed set from parameter
+  * @param     mission_item_speed, desired speed set from mission item
+  * @returns   maximum speed
+  **/
+  float getMaxSpeed(const float jerk, const float accel, const float braking_distance, const float mpc_xy_cruise,
+                    const float mission_item_speed) const;
+
  public:
   std::vector<uint8_t> histogram_image_data_;
   std::vector<uint8_t> cost_image_data_;
diff --git a/local_planner/src/nodes/local_planner.cpp b/local_planner/src/nodes/local_planner.cpp
index 62780fa90..9b48a2f20 100644
--- a/local_planner/src/nodes/local_planner.cpp
+++ b/local_planner/src/nodes/local_planner.cpp
@@ -128,7 +128,11 @@ void LocalPlanner::determineStrategy() {
     simulation_limits lims;
     lims.max_z_velocity = px4_.param_mpc_z_vel_max_up;
     lims.min_z_velocity = -1.0f * px4_.param_mpc_z_vel_max_dn;
-    lims.max_xy_velocity_norm = px4_.param_mpc_xy_cruise;
+    lims.max_xy_velocity_norm =
+        std::min(getMaxSpeed(px4_.param_mpc_jerk_max, px4_.param_mpc_acc_hor, max_sensor_range_,
+                             px4_.param_mpc_xy_cruise, mission_item_speed_),
+                 getMaxSpeed(px4_.param_mpc_jerk_max, px4_.param_mpc_acc_hor, (goal_ - position_).norm(),
+                             px4_.param_mpc_xy_cruise, mission_item_speed_));
     lims.max_acceleration_norm = px4_.param_mpc_acc_hor;
     lims.max_jerk_norm = px4_.param_mpc_jerk_max;
     star_planner_->setParams(cost_params_, lims, px4_.param_nav_acc_rad);
@@ -212,19 +216,8 @@ avoidanceOutput LocalPlanner::getAvoidanceOutput() const {
   out.waypoint_type = waypoint_type_;
   out.obstacle_ahead = !polar_histogram_.isEmpty();
 
-  // calculate maximum speed given the sensor range and vehicle parameters
-  // quadratic solve of 0 = u^2 + 2as, with s = u * |a/j| + r
-  // u = initial velocity, a = max acceleration
-  // s = stopping distance under constant acceleration
-  // j = maximum jerk, r = maximum range sensor distance
-  float accel_ramp_time = px4_.param_mpc_acc_hor / px4_.param_mpc_jerk_max;
-  float a = 1;
-  float b = 2 * px4_.param_mpc_acc_hor * accel_ramp_time;
-  float c = 2 * -px4_.param_mpc_acc_hor * max_sensor_range_;
-  float limited_speed = (-b + std::sqrt(b * b - 4 * a * c)) / (2 * a);
-
-  float speed = std::isfinite(mission_item_speed_) ? mission_item_speed_ : px4_.param_mpc_xy_cruise;
-  float max_speed = std::min(speed, limited_speed);
+  float max_speed = getMaxSpeed(px4_.param_mpc_jerk_max, px4_.param_mpc_acc_hor, max_sensor_range_,
+                                px4_.param_mpc_xy_cruise, mission_item_speed_);
 
   out.cruise_velocity = max_speed;
   out.last_path_time = last_path_time_;
@@ -232,4 +225,23 @@ avoidanceOutput LocalPlanner::getAvoidanceOutput() const {
   out.path_node_setpoints = star_planner_->path_node_setpoints_;
   return out;
 }
+
+float LocalPlanner::computeMaxSpeedFromBrakingDistance(const float jerk, const float accel,
+                                                       const float braking_distance) const {
+  // Calculate maximum speed given the sensor range and vehicle parameters
+  // We assume a constant acceleration profile with a delay of 2*accel/jerk (time to reach the desired acceleration from
+  // opposite max acceleration)
+  // Equation to solve: 0 = vel^2 - 2*acc*(x - vel*2*acc/jerk)
+  float b = 4.f * accel * accel / jerk;
+  float c = -2.f * accel * braking_distance;
+
+  return 0.5f * (-b + sqrtf(b * b - 4.f * c));
+}
+
+float LocalPlanner::getMaxSpeed(const float jerk, const float accel, const float braking_distance,
+                                const float mpc_xy_cruise, const float mission_item_speed) const {
+  float limited_speed = computeMaxSpeedFromBrakingDistance(jerk, accel, braking_distance);
+  float speed = std::isfinite(mission_item_speed) ? mission_item_speed : mpc_xy_cruise;
+  return std::min(speed, limited_speed);
+}
 }
diff --git a/local_planner/src/nodes/tree_node.cpp b/local_planner/src/nodes/tree_node.cpp
index 234804335..329579854 100644
--- a/local_planner/src/nodes/tree_node.cpp
+++ b/local_planner/src/nodes/tree_node.cpp
@@ -3,12 +3,7 @@
 namespace avoidance {
 
 TreeNode::TreeNode(int from, const simulation_state& start_state, const Eigen::Vector3f& sp)
-    : total_cost_{0.0f},
-      heuristic_{0.0f},
-      origin_{from},
-      closed_{false},
-      state(start_state),
-      setpoint(sp) {}
+    : total_cost_{0.0f}, heuristic_{0.0f}, origin_{from}, closed_{false}, state(start_state), setpoint(sp) {}
 
 void TreeNode::setCosts(float h, float c) {
   heuristic_ = h;