A system and method for preventing a run-away state of an industrial machine. Joints of the industrial machine are monitored in order to determine if the industrial machine is in danger of entering a run-away state. If a joint parameter exceeds a threshold value, which is indicative of the potential to enter a run-away state, then a force or torque limit is increased so that the industrial machine has additional force or torque to slow down the industrial machine when decelerating. This additional torque prevents the industrial machine from entering the run-away state.