diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
index 0c0426b175..da401d5630 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
@@ -133,5 +133,8 @@ bool FlightTaskOrbit::update()
 
 	// make vehicle front always point towards the center
 	_yaw_setpoint = atan2f(center_to_position(1), center_to_position(0)) + M_PI_F;
+	// yawspeed feed-forward because we know the necessary angular rate
+	_yawspeed_setpoint = -_v / _r;
+
 	return true;
 }