diff --git a/modules/prediction/common/prediction_gflags.cc b/modules/prediction/common/prediction_gflags.cc
index f55d0b652a26c1bf03d2b24b0a2dea9e33b78ea1..9ea4d27286dc2c28d33a758e82e1b29892a6bf3f 100644
--- a/modules/prediction/common/prediction_gflags.cc
+++ b/modules/prediction/common/prediction_gflags.cc
@@ -87,6 +87,10 @@ DEFINE_double(rnn_min_lane_relatice_s, 5.0,
 DEFINE_double(perception_confidence_threshold, 0.4,
               "Skip the perception obstacle if its confiderence is lower than "
               "this threshold.");
+DEFINE_bool(enable_adjust_velocity_heading, true,
+            "adjust velocity heading to lane heading");
+DEFINE_double(heading_diff_thred, M_PI / 6.0,
+              "Threshold for adjusting on-lane obstacle heading");
 
 // Obstacle trajectory
 DEFINE_double(lane_sequence_threshold, 0.5,
diff --git a/modules/prediction/common/prediction_gflags.h b/modules/prediction/common/prediction_gflags.h
index 35099bfae76562272d38bb2a4050b9a8b371fef2..a174caf3a4b4be30b5eb52d6bc15fd7d1d5ef2c1 100644
--- a/modules/prediction/common/prediction_gflags.h
+++ b/modules/prediction/common/prediction_gflags.h
@@ -61,6 +61,8 @@ DECLARE_double(still_speed);
 DECLARE_string(evaluator_vehicle_mlp_file);
 DECLARE_string(evaluator_vehicle_rnn_file);
 DECLARE_int32(max_num_obstacles);
+DECLARE_bool(enable_adjust_velocity_heading);
+DECLARE_double(heading_diff_thred);
 
 // evaluator
 DECLARE_double(rnn_min_lane_relatice_s);
diff --git a/modules/prediction/container/obstacles/obstacle.cc b/modules/prediction/container/obstacles/obstacle.cc
index 42d231b96db53d018f7961e5ffcd5f8b290ff29f..d2203156c0668e00f69d7ed9076217d7d8573d1b 100644
--- a/modules/prediction/container/obstacles/obstacle.cc
+++ b/modules/prediction/container/obstacles/obstacle.cc
@@ -144,7 +144,6 @@ bool Obstacle::IsNearJunction() {
 
 void Obstacle::Insert(const PerceptionObstacle& perception_obstacle,
                       const double timestamp) {
-  std::lock_guard<std::mutex> lock(mutex_);
   if (feature_history_.size() > 0 &&
       timestamp <= feature_history_.front().timestamp()) {
     AERROR << "Obstacle [" << id_ << "] received an older frame ["
@@ -277,13 +276,37 @@ void Obstacle::SetVelocity(const PerceptionObstacle& perception_obstacle,
       velocity_z = perception_obstacle.velocity().z();
     }
   }
+  double velocity_heading = std::atan2(velocity_y, velocity_x);
+
+  if (FLAGS_enable_adjust_velocity_heading && IsOnLane()) {
+    double speed = std::hypot(velocity_x, velocity_y);
+    double theta = 0.0;
+    if (perception_obstacle.has_theta()) {
+      theta = perception_obstacle.theta();
+    }
+    double heading_diff = std::abs(velocity_heading - theta);
+    if (heading_diff > FLAGS_heading_diff_thred) {
+      if (history_size() == 0) {
+        velocity_x = speed * std::cos(theta);
+        velocity_y = speed * std::sin(theta);
+      } else {
+        double prev_x = mutable_feature(0)->position().x();
+        double prev_y = mutable_feature(0)->position().y();
+        double diff_x = feature->position().x() - prev_x;
+        double diff_y = feature->position().y() - prev_y;
+        velocity_heading = std::atan2(diff_y, diff_x);
+        velocity_x = speed * std::cos(velocity_heading);
+        velocity_y = speed * std::sin(velocity_heading);
+      }
+    }
+  }
 
   feature->mutable_velocity()->set_x(velocity_x);
   feature->mutable_velocity()->set_y(velocity_y);
   feature->mutable_velocity()->set_z(velocity_z);
 
   double speed = std::hypot(std::hypot(velocity_x, velocity_y), velocity_z);
-  double velocity_heading = std::atan2(velocity_y, velocity_x);
+  velocity_heading = std::atan2(velocity_y, velocity_x);
   feature->set_velocity_heading(velocity_heading);
   feature->set_speed(speed);
 
@@ -1074,6 +1097,7 @@ void Obstacle::SetMotionStatus() {
 }
 
 void Obstacle::InsertFeatureToHistory(Feature* feature) {
+  std::lock_guard<std::mutex> lock(mutex_);
   feature_history_.push_front(std::move(*feature));
   ADEBUG << "Obstacle [" << id_ << "] inserted a frame into the history.";
 }