diff --git a/joint_trajectory_controller/src/trajectory.cpp b/joint_trajectory_controller/src/trajectory.cpp
index 7615eb7c5a..0fa195258e 100644
--- a/joint_trajectory_controller/src/trajectory.cpp
+++ b/joint_trajectory_controller/src/trajectory.cpp
@@ -143,7 +143,7 @@ bool Trajectory::sample(
     const rclcpp::Time t0 = trajectory_start_time_ + point.time_from_start;
     const rclcpp::Time t1 = trajectory_start_time_ + next_point.time_from_start;
 
-    if (sample_time >= t0 && sample_time < t1)
+    if (sample_time >= t0 && sample_time <= t1)
     {
       // If interpolation is disabled, just forward the next waypoint
       if (interpolation_method == interpolation_methods::InterpolationMethod::NONE)
@@ -174,10 +174,6 @@ bool Trajectory::sample(
   auto & last_point = trajectory_msg_->points[trajectory_msg_->points.size() - 1];
 
   // FIXME(destogl): this is from backport - check if needed
-  //   // whole animation has played out
-  //   start_segment_itr = --end();
-  //   end_segment_itr = end();
-  //   expected_state = (*start_segment_itr);
   //
   //   // TODO: Add and test enforceJointLimits? Unsure if needed for end of animation
   //   // Yes, call enforceJointLimits to handle halting in servo, which has time_from_start == 1ns
@@ -235,9 +231,15 @@ bool Trajectory::sample(
   }
   else
   {
-    const rclcpp::Time t0 = trajectory_start_time_ + last_point.time_from_start;
-    // do not do splines when trajectory has finished because the time is achieved
-    interpolate_between_points(t0, last_point, t0, last_point, sample_time, output_state);
+    // OLD: the following 3 lines --> maybe to delete
+    // const rclcpp::Time t0 = trajectory_start_time_ + last_point.time_from_start;
+    // // do not do splines when trajectory has finished because the time is achieved
+    // interpolate_between_points(t0, last_point, t0, last_point, sample_time, output_state);
+
+    // whole animation has played out
+    start_segment_itr = --end();
+    end_segment_itr = end();
+    output_state = (*start_segment_itr);
   }
 
   return true;
diff --git a/joint_trajectory_controller/test/test_trajectory.cpp b/joint_trajectory_controller/test/test_trajectory.cpp
index 2a48aa1f2b..f69f2dd62e 100644
--- a/joint_trajectory_controller/test/test_trajectory.cpp
+++ b/joint_trajectory_controller/test/test_trajectory.cpp
@@ -196,6 +196,7 @@ TEST(TestTrajectory, sample_trajectory_positions)
       start, end, rclcpp::Duration::from_seconds(0.1), joint_limiter_);
     ASSERT_EQ((--traj.end()), start);
     ASSERT_EQ(traj.end(), end);
+    std::cout << "Expected state size: " << expected_state.positions.size() << std::endl;
     EXPECT_NEAR(p3.positions[0], expected_state.positions[0], EPS);
   }
 
@@ -477,17 +478,17 @@ TEST(TestTrajectory, sample_trajectory_velocity_with_interpolation)
     EXPECT_NEAR(position_third_seg, expected_state.positions[0], EPS);
     EXPECT_NEAR(p3.velocities[0], expected_state.velocities[0], EPS);
     // the goal is reached so no acceleration anymore
-    EXPECT_NEAR(0, expected_state.accelerations[0], EPS);
+    EXPECT_NEAR(0.0, expected_state.accelerations[0], EPS);
   }
 
-  // sample past given points - movement virtually stops
+  // sample past given points - if there is velocity continue sampling
   {
     traj.sample(
       time_now + rclcpp::Duration::from_seconds(3.125), DEFAULT_INTERPOLATION, expected_state,
       start, end, rclcpp::Duration::from_seconds(0.1), joint_limiter_);
     EXPECT_EQ((--traj.end()), start);
     EXPECT_EQ(traj.end(), end);
-    EXPECT_NEAR(position_third_seg, expected_state.positions[0], EPS);
+    EXPECT_NEAR(position_third_seg + p3.velocities[0] * 0.1, expected_state.positions[0], EPS);
     EXPECT_NEAR(p3.velocities[0], expected_state.velocities[0], EPS);
     EXPECT_NEAR(0.0, expected_state.accelerations[0], EPS);
   }