In some applications, a piston of a hydraulic actuator may move at high speeds, and large undesired forces may be generated if the piston reaches an end-stop of the hydraulic actuator at a high speed. The undesired forces may, for example, cause mechanical damage in the hydraulic actuator. A controller may receive information indicative of the piston reaching a first position at a first threshold distance from the end-stop, and, in response, may modify a signal to a valve assembly controlling flow of hydraulic fluid to and from the hydraulic actuator. Further, the controller may receive information indicative of the piston reaching a second position at a second threshold distance closer to the end-stop of the hydraulic actuator, and, in response, the controller may further modify the signal to the valve assembly so as to apply a force on the piston in a away from the end-stop.